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

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index d5d0d94..17e3788 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -132,7 +132,7 @@ public:
   // Does this device use drawChar() or drawString()?
   virtual GBool useDrawChar();
   
-  virtual GBool interpretType3Chars() {return gFalse;}
+  virtual GBool interpretType3Chars() {return gTrue;}
 
   //----- initialization and control
 
@@ -176,9 +176,9 @@ public:
   virtual void beginString(GfxState *state, GString *s) ;
   virtual void endString(GfxState *state) ;
   virtual void drawChar(GfxState *state, double x, double y,
-			double dx, double dy, Guchar c) ;
-  virtual void drawChar16(GfxState *state, double x, double y,
-			  double dx, double dy, int c) ;
+			double dx, double dy,
+			double originX, double originY,
+			CharCode code, Unicode *u, int uLen);
 
   //----- image drawing
   virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
@@ -186,7 +186,11 @@ public:
 			     GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
-			 GBool inlineImg);
+			 int *maskColors, GBool inlineImg);
+  
+  virtual GBool beginType3Char(GfxState *state,
+			       CharCode code, Unicode *u, int uLen);
+  virtual void endType3Char(GfxState *state);
 
   private:
   void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
@@ -206,6 +210,8 @@ public:
   int linkinfo; // did we write "File contains links" yet?
   int ttfinfo; // did we write "File contains TrueType Fonts" yet?
 
+  int type3active; // are we between beginType3()/endType3()?
+
   GfxState *laststate;
 };
 
@@ -339,7 +345,7 @@ void showFontError(GfxFont*font, int nr)
     else if(nr == 1)
       logf("<warning> The following font caused problems (substituting):");
     else if(nr == 2)
-      logf("<warning> This document contains Type 3 Fonts: (some text may be incorrectly displayed)");
+      logf("<warning> The following Type 3 Font will be rendered as bitmap:");
     dumpFontInfo("<warning>", font);
 }
 
@@ -355,7 +361,7 @@ void dumpFontInfo(char*loglevel, GfxFont*font)
   if(gstr) 
    logf("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
   
-  //if(font->is16Bit()) logf("%sis 16 bit\n", loglevel); //FIXME: not existing in xpdf 1.01
+  if(font->isCIDFont()) logf("%sis CID font\n", loglevel);
 
   GfxFontType type=font->getType();
   switch(type) {
@@ -413,9 +419,11 @@ SWFOutputDev::SWFOutputDev()
     ttfinfo = 0;
     linkinfo = 0;
     pbminfo = 0;
+    type3active = 0;
     clippos = 0;
     clipping[clippos] = 0;
     outputstarted = 0;
+    xref = 0;
 //    printf("SWFOutputDev::SWFOutputDev() \n");
 };
 
@@ -566,7 +574,10 @@ void SWFOutputDev::beginString(GfxState *state, GString *s)
 }
 
 int charcounter = 0;
-void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, Guchar c) 
+void SWFOutputDev::drawChar(GfxState *state, double x, double y,
+			double dx, double dy,
+			double originX, double originY,
+			CharCode c, Unicode *u, int uLen)
 {
     logf("<debug> drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c);
     // check for invisible text -- this is used by Acrobat Capture
@@ -575,7 +586,11 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub
        GfxFont*font = state->getFont();
        Gfx8BitFont*font8;
        if(font->isCIDFont()) {
-	   logf("<error> CID Font\n");
+	   logf("<error> CID Font");
+	   return;
+       }
+       if(font->getType() == fontType3) {
+	   /* type 3 chars are passed primarily as graphics */
 	   return;
        }
        font8 = (Gfx8BitFont*)font;
@@ -594,17 +609,28 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub
     }
 }
 
-void SWFOutputDev::drawChar16(GfxState *state, double x, double y, double dx, double dy, int c) 
-{
-    printf("<error> drawChar16(%f,%f,%f,%f,%08x)\n",x,y,dx,dy,c);
-    exit(1);
-}
-
 void SWFOutputDev::endString(GfxState *state) 
 { 
     logf("<debug> endstring\n");
 }    
 
+ 
+GBool SWFOutputDev::beginType3Char(GfxState *state,
+			       CharCode code, Unicode *u, int uLen)
+{
+    logf("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
+    type3active = 1;
+    /* the character itself is going to be passed using
+       drawImageMask() */
+    return gFalse; /* gTrue= is_in_cache? */
+}
+
+void SWFOutputDev::endType3Char(GfxState *state)
+{
+    type3active = 0;
+    logf("<debug> endType3Char");
+}
+
 void SWFOutputDev::startPage(int pageNum, GfxState *state) 
 {
   double x1,y1,x2,y2;
@@ -1135,7 +1161,7 @@ void SWFOutputDev::updateFont(GfxState *state)
   Ref embRef;
   GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
   if(embedded) {
-    if (//!gfxFont->is16Bit() && FIXME: not in xpdf 1.01
+    if (!gfxFont->isCIDFont() &&
 	(gfxFont->getType() == fontType1 ||
 	 gfxFont->getType() == fontType1C ||
 	 gfxFont->getType() == fontTrueType)) {
@@ -1192,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)
@@ -1235,10 +1313,12 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   state->transform(1, 1, &x4, &y4);
 
   if(!pbminfo && !(str->getKind()==strDCT)) {
-      logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+      if(!type3active) {
+	  logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
+	  pbminfo = 1;
+      }
       if(mask)
       logf("<verbose> drawing %d by %d masked picture\n", width, height);
-      pbminfo = 1;
   }
   if(!jpeginfo && (str->getKind()==strDCT)) {
       logf("<notice> file contains jpeg pictures");
@@ -1251,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 {
@@ -1331,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 {
@@ -1376,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 {
@@ -1401,11 +1533,13 @@ void SWFOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 }
 
 void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-			       int width, int height,
-			       GfxImageColorMap *colorMap, GBool inlineImg) 
+			 int width, int height, GfxImageColorMap *colorMap,
+			 int *maskColors, GBool inlineImg)
 {
-  logf("<verbose> drawImage %dx%d, %s, inline=%d", width, height, 
-	  colorMap?"colorMap":"no colorMap", inlineImg);
+  logf("<verbose> drawImage %dx%d, %s %s, inline=%d", width, height, 
+	  colorMap?"colorMap":"no colorMap", 
+	  maskColors?"maskColors":"no maskColors",
+	  inlineImg);
   if(colorMap)
       logf("<verbose> colorMap pixcomps:%d bits:%d mode:%d\n", colorMap->getNumPixelComps(),
 	      colorMap->getBits(),colorMap->getColorSpace()->getMode());
@@ -1461,8 +1595,6 @@ void pdfswf_init(char*filename, char*userPassword)
   GString *fileName = new GString(filename);
   GString *userPW;
   Object info;
-  // init error file
-  //errorInit(); FIXME xpdf 1.01
 
   // read config file
   globalParams = new GlobalParams("");
@@ -1483,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");
@@ -1492,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
@@ -1522,13 +1654,10 @@ 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());
 }
 
 void pdfswf_drawonlyshapes()
@@ -1612,3 +1741,4 @@ void pdfswf_close()
     gMemReport(stderr);
 }
 
+