X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=532aa9a9a0eb0a33c8ffc9b6919d2ac98c4b1882;hb=2f2c12340920b5764b1a697ea5f21318eb8b5f03;hp=d26267421c99ad218e9abab96618b176c3fba4b5;hpb=84fbf70eec7a04cb3a3e42ee610f7673d39d4926;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index d262674..532aa9a 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -61,7 +61,11 @@ static void printInfoDate(Dict *infoDict, char *key, char *fmt);
 
 double fontsizes[] = 
 {
- 0.833,0.833,0.889,0.889,0.788,0.722,0.833,0.778,0.600,0.600,0.600,0.600,0.576,0.576,0.576,0.576
+ 0.833,0.833,0.889,0.889,
+ 0.788,0.722,0.833,0.778,
+ 0.600,0.600,0.600,0.600,
+ 0.576,0.576,0.576,0.576,
+ 0.733 //?
 };
 char*fontnames[]={
 "Helvetica",             
@@ -103,48 +107,6 @@ struct mapping {
 {"Symbol",                "s050000l.pfb"},
 {"ZapfDingbats",          "d050000l.pfb"}};
 
-static void printInfoString(Dict *infoDict, char *key, char *fmt) {
-  Object obj;
-  GString *s1, *s2;
-  int i;
-
-  if (infoDict->lookup(key, &obj)->isString()) {
-    s1 = obj.getString();
-    if ((s1->getChar(0) & 0xff) == 0xfe &&
-	(s1->getChar(1) & 0xff) == 0xff) {
-      s2 = new GString();
-      for (i = 2; i < obj.getString()->getLength(); i += 2) {
-	if (s1->getChar(i) == '\0') {
-	  s2->append(s1->getChar(i+1));
-	} else {
-	  delete s2;
-	  s2 = new GString("<unicode>");
-	  break;
-	}
-      }
-      printf(fmt, s2->getCString());
-      delete s2;
-    } else {
-      printf(fmt, s1->getCString());
-    }
-  }
-  obj.free();
-}
-
-static void printInfoDate(Dict *infoDict, char *key, char *fmt) {
-  Object obj;
-  char *s;
-
-  if (infoDict->lookup(key, &obj)->isString()) {
-    s = obj.getString()->getCString();
-    if (s[0] == 'D' && s[1] == ':') {
-      s += 2;
-    }
-    printf(fmt, s);
-  }
-  obj.free();
-}
-
 class GfxState;
 class GfxImageColorMap;
 
@@ -228,6 +190,7 @@ public:
   int clippos;
 
   int setT1Font(char*name,FontEncoding*enc);
+  char* substitutefont(GfxFont*gfxFont);
   int t1id;
   int jpeginfo; // did we write "File contains jpegs" yet?
   int pbminfo; // did we write "File contains jpegs" yet?
@@ -909,74 +872,38 @@ char* gfxFontName(GfxFont* gfxFont)
       }
 }
 
-void SWFOutputDev::updateFont(GfxState *state) 
+char* SWFOutputDev::substitutefont(GfxFont*gfxFont)
 {
-  double m11, m12, m21, m22;
-  char * fontname = 0;
-  GfxFont*gfxFont = state->getFont();
-  char * fileName = 0;
-    
-//  logf("<debug> %s updateFont\n", gfxstate2str(state));
-
-  if (!gfxFont) {
-    return;
-  }  
-
-  if(swfoutput_queryfont(&output, gfxFontName(gfxFont)))
-  {
-      swfoutput_setfont(&output, gfxFontName(gfxFont), -1, 0);
-      return;
-  }
-
-  // look for Type 3 font
-  if (!type3Warning && gfxFont->getType() == fontType3) {
-    type3Warning = gTrue;
-    showFontError(gfxFont, 2);
-  }
-  //dumpFontInfo ("<notice>", gfxFont);
-
-  Ref embRef;
-  GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
-  if(embedded) {
-    if (!gfxFont->is16Bit() &&
-	(gfxFont->getType() == fontType1 ||
-	 gfxFont->getType() == fontType1C)) {
-	
-	fileName = writeEmbeddedFontToFile(gfxFont);
-	if(!fileName)
-	  return ;
-    }
-    else {
-	showFontError(gfxFont,0);
-	return ;
-    }
-    
-    t1id = T1_AddFont(fileName);
-  } else {
-    fontname = NULL;
-    if(gfxFont->getName()) {
-      fontname = gfxFont->getName()->getCString();
-      //logf("<notice> Processing font %s", fontname);
-    }
-    if(!fontname || !setT1Font(state->getFont()->getName()->getCString(), gfxFont->getEncoding()))
-    { //substitute font
+      //substitute font
+      char* fontname = 0;
+      double m11, m12, m21, m22;
       int index;
       int code;
       double w,w1,w2;
       double*fm;
       double v;
+      if(gfxFont->getName()) {
+	fontname = gfxFont->getName()->getCString();
+      }
+
+//	  printf("%d %s\n", t, gfxFont->getCharName(t));
       showFontError(gfxFont, 1);
       if (!gfxFont->is16Bit()) {
-	if (gfxFont->isFixedWidth()) {
+	if(gfxFont->isSymbolic()) {
+	  if(fontname && (strstr(fontname,"ing"))) //Dingbats, Wingdings etc.
+	   index = 16;
+	  else 
+	   index = 12;
+        } else if (gfxFont->isFixedWidth()) {
 	  index = 8;
 	} else if (gfxFont->isSerif()) {
 	  index = 4;
 	} else {
 	  index = 0;
 	}
-	if (gfxFont->isBold())
+	if (gfxFont->isBold() && index!=16)
 	  index += 2;
-	if (gfxFont->isItalic())
+	if (gfxFont->isItalic() && index!=16)
 	  index += 1;
 	fontname = fontnames[index];
 	// get width of 'm' in real font and substituted font
@@ -1020,10 +947,58 @@ void SWFOutputDev::updateFont(GfxState *state)
       }
       if(fontname)
         setT1Font(fontname, gfxFont->getEncoding());
+      return fontname;
+}
+
+void SWFOutputDev::updateFont(GfxState *state) 
+{
+  char * fontname = 0;
+  GfxFont*gfxFont = state->getFont();
+  char * fileName = 0;
+    
+  if (!gfxFont) {
+    return;
+  }  
+  
+  if(gfxFont->getName()) {
+    fontname = gfxFont->getName()->getCString();
+  }
+
+  if(swfoutput_queryfont(&output, gfxFontName(gfxFont)))
+  {
+      swfoutput_setfont(&output, gfxFontName(gfxFont), -1, 0);
+      return;
+  }
+
+  // look for Type 3 font
+  if (!type3Warning && gfxFont->getType() == fontType3) {
+    type3Warning = gTrue;
+    showFontError(gfxFont, 2);
+  }
+  //dumpFontInfo ("<notice>", gfxFont);
+
+  Ref embRef;
+  GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
+  if(embedded) {
+    if (!gfxFont->is16Bit() &&
+	(gfxFont->getType() == fontType1 ||
+	 gfxFont->getType() == fontType1C)) {
+	
+	fileName = writeEmbeddedFontToFile(gfxFont);
+	if(!fileName)
+	  return ;
+	this->t1id = T1_AddFont(fileName);
+    }
+    else {
+	showFontError(gfxFont,0);
+	fontname = substitutefont(gfxFont);
     }
+  } else {
+    if(!fontname || !setT1Font(state->getFont()->getName()->getCString(), gfxFont->getEncoding()))
+	fontname = substitutefont(gfxFont);
   }
 
-  swfoutput_setfont(&output,gfxFontName(gfxFont),t1id, fileName);
+  swfoutput_setfont(&output,gfxFontName(gfxFont),this->t1id, fileName);
   if(fileName)
       unlink(fileName);
 }
@@ -1045,8 +1020,19 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   ImageStream *imgStr;
   Guchar pixBuf[4];
   GfxRGB rgb;
-  if(!width || !height)
+  if(!width || !height || (height<=1 && width<=1))
+  {
+      logf("<verbose> Ignoring %d by %d image", width, height);
+      int i,j;
+      if (inlineImg) {
+	j = height * ((width + 7) / 8);
+	str->reset();
+	for (i = 0; i < j; ++i) {
+	  str->getChar();
+	}
+      }
       return;
+  }
   
   state->transform(0, 1, &x1, &y1);
   state->transform(0, 0, &x2, &y2);
@@ -1106,25 +1092,62 @@ void SWFOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
     if(!pbminfo) {
 	logf("<notice> file contains pbm pictures %s",mask?"(masked)":"");
 	if(mask)
-	logf("<verbose> ignoring %d by %d masked picture\n", width, height);
+	logf("<verbose> drawing %d by %d masked picture\n", width, height);
 	pbminfo = 1;
     }
 
     if(mask) {
-	str->reset();
-	int yes=0;
-	while ((c = str->getChar()) != EOF)
+	imgStr = new ImageStream(str, width, 1, 1);
+	imgStr->reset();
+	return;
+	int yes=0,i,j;
+	unsigned char buf[8];
+	int xid = 0;
+	int yid = 0;
+	int x,y;
+	int width2 = (width+3)&(~3);
+	unsigned char*pic = new unsigned char[width2*height];
+	RGBA pal[256];
+	GfxRGB rgb;
+	state->getFillRGB(&rgb);
+	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;
+	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;
+	for (y = 0; y < height; ++y)
+        for (x = 0; x < width; ++x)
 	{
-	    if((c<32 || c>'z') && yes && (c!=13) && (c!=10)) {
-		printf("no ascii: %02x\n", c);
-		yes = 1;
-	   }
+	      imgStr->getPixel(buf);
+              pic[width*y+x] = buf[0];
+	      xid+=x*buf[0]+1;
+	      yid+=y*buf[0]+1;
+	}
+	int t,found = -1;
+	for(t=0;t<picpos;t++)
+	{
+	    if(pic_xids[t] == xid &&
+	       pic_yids[t] == yid) {
+		found = t;break;
+	    }
+	}
+	if(found<0) {
+	    pic_ids[picpos] = swfoutput_drawimagelossless256(&output, pic, pal, width, height, 
+		    x1,y1,x2,y2,x3,y3,x4,y4);
+	    pic_xids[picpos] = xid;
+	    pic_yids[picpos] = yid;
+	    if(picpos<1024)
+		picpos++;
+	} else {
+	    swfoutput_drawimageagain(&output, pic_ids[found], width, height,
+		    x1,y1,x2,y2,x3,y3,x4,y4);
 	}
+	free(pic);
     } else {
 	int x,y;
 	int width2 = (width+3)&(~3);
 	imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),
-				 colorMap->getBits());
+	        		   colorMap->getBits());
 	imgStr->reset();
 
 	if(colorMap->getNumPixelComps()!=1)
@@ -1235,6 +1258,48 @@ void SWFOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 
 SWFOutputDev*output = 0; 
 
+static void printInfoString(Dict *infoDict, char *key, char *fmt) {
+  Object obj;
+  GString *s1, *s2;
+  int i;
+
+  if (infoDict->lookup(key, &obj)->isString()) {
+    s1 = obj.getString();
+    if ((s1->getChar(0) & 0xff) == 0xfe &&
+	(s1->getChar(1) & 0xff) == 0xff) {
+      s2 = new GString();
+      for (i = 2; i < obj.getString()->getLength(); i += 2) {
+	if (s1->getChar(i) == '\0') {
+	  s2->append(s1->getChar(i+1));
+	} else {
+	  delete s2;
+	  s2 = new GString("<unicode>");
+	  break;
+	}
+      }
+      printf(fmt, s2->getCString());
+      delete s2;
+    } else {
+      printf(fmt, s1->getCString());
+    }
+  }
+  obj.free();
+}
+
+static void printInfoDate(Dict *infoDict, char *key, char *fmt) {
+  Object obj;
+  char *s;
+
+  if (infoDict->lookup(key, &obj)->isString()) {
+    s = obj.getString()->getCString();
+    if (s[0] == 'D' && s[1] == ':') {
+      s += 2;
+    }
+    printf(fmt, s);
+  }
+  obj.free();
+}
+
 void pdfswf_init(char*filename, char*userPassword) 
 {
   GString *fileName = new GString(filename);