X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=6f7d910ed24c773620ab44d51fe3687f10f560ee;hb=f7e02fdcc5f94e3129124abb157037d7b54553e9;hp=b0472ba053d40fac9dd9c4ef61a290a23b0b154f;hpb=c8e0d0bd8cc515f60ab6a1248caf6fdc8945d89e;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index b0472ba..6f7d910 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -624,8 +624,6 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 			double originX, double originY,
 			CharCode c, Unicode *_u, int uLen)
 {
-    msg("<debug> drawChar(%f,%f,%f,%f,'%c')\n",x,y,dx,dy,c);
-    
     // check for invisible text -- this is used by Acrobat Capture
     if ((state->getRender() & 3) == 3)
 	return;
@@ -640,13 +638,16 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
     x1 = x;
     y1 = y;
     state->transform(x, y, &x1, &y1);
+	
+    Unicode u=0;
+    if(_u) 
+	u = *_u;
+    
+    msg("<debug> drawChar(%f,%f,%f,%f,'%c',%d)\n",x,y,dx,dy,c,u);
 
     if(font->isCIDFont()) {
 	GfxCIDFont*cfont = (GfxCIDFont*)font;
-	Unicode u=0;
 	char*name=0;
-	if(_u) 
-	    u = *_u;
 	if(u) {
 	    int t;
 	    for(t=0;t<sizeof(nameToUnicodeTab)/sizeof(nameToUnicodeTab[0]);t++)
@@ -656,13 +657,12 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 		    break;
 		}
 	}
-/*	   printf("%02x %04x/%04x-%d \"%s\" %s %d\n", c,u, *_u, uLen, name, cfont->getName()->getCString(),
-		cfont->getType());*/
 
 	if(name)
 	   swfoutput_drawchar(&output, x1, y1, name, c);
 	else
 	   msg("<warning> couldn't get name for CID character %02x from Encoding", c);
+	   swfoutput_drawchar(&output, x1, y1, "<unknown>", c);
     } else {
 	Gfx8BitFont*font8;
 	font8 = (Gfx8BitFont*)font;
@@ -672,6 +672,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 	   swfoutput_drawchar(&output, x1, y1, enc[c], c);
 	else {
 	   msg("<warning> couldn't get name for character %02x from Encoding", c);
+	   swfoutput_drawchar(&output, x1, y1, "<unknown>", c);
 	}
     }
 }
@@ -708,6 +709,7 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state)
   state->transform(state->getX1(),state->getY1(),&x1,&y1);
   state->transform(state->getX2(),state->getY2(),&x2,&y2);
   if(!outputstarted) {
+    msg("<verbose> Bounding box is (%f,%f)-(%f,%f)", x1,y1,x2,y2);
     swfoutput_init(&output, swffilename, abs((int)(x2-x1)),abs((int)(y2-y1)));
     outputstarted = 1;
   }
@@ -888,6 +890,8 @@ int SWFOutputDev::searchT1Font(char*name)
     int i;
     int mapid=-1;
     char*filename=0;
+	
+    msg("<verbose> SearchT1Font(%s)", name);
 
     for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++) 
     {
@@ -978,10 +982,10 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
       int c;
       char *fontBuf;
       int fontLen;
-      Type1CFontFile *cvt;
       Ref embRef;
       Object refObj, strObj;
-      tmpFileName = "/tmp/tmpfont";
+      char namebuf[512];
+      tmpFileName = mktmpname(namebuf);
       int ret;
 
       ret = font->getEmbeddedFontID(&embRef);
@@ -1003,10 +1007,21 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 	  msg("<error> Couldn't read embedded font file");
 	  return 0;
 	}
-	cvt = new Type1CFontFile(fontBuf, fontLen);
+	Type1CFontFile *cvt = new Type1CFontFile(fontBuf, fontLen);
 	cvt->convertToType1(f);
 	delete cvt;
 	gfree(fontBuf);
+      } else if(font->getType() == fontTrueType) {
+	msg("<verbose> writing font using TrueTypeFontFile::writeTTF");
+	if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
+	  fclose(f);
+	  msg("<error> Couldn't read embedded font file");
+	  return 0;
+	}
+	TrueTypeFontFile *cvt = new TrueTypeFontFile(fontBuf, fontLen);
+	cvt->writeTTF(f);
+	delete cvt;
+	gfree(fontBuf);
       } else {
 	font->getEmbeddedFontID(&embRef);
 	refObj.initRef(embRef.num, embRef.gen);
@@ -1050,25 +1065,25 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 	      msg("<notice> File contains TrueType fonts");
 	      ttfinfo = 1;
 	  }
-	  char name2[80];
+	  char name2[512];
 	  char*tmp;
 	  tmp = strdup(mktmpname((char*)name2));
 	  sprintf(name2, "%s", tmp);
-	  char*a[] = {"./ttf2pt1", "-W0",
+	  char*a[] = {"./ttf2pt1", "-W", "0",
 #ifndef USE_FREETYPE
-	      "-pttf",
+	      "-p", "ttf",
 #else
-	      "-pft",
+	      "-p", "ft",
 #endif
 	      "-b", tmpFileName, name2};
-	  msg("<verbose> Invoking ttf2pt1...");
-	  ttf2pt1_main(6,a);
-	  unlink(tmpFileName);
+	  msg("<verbose> Invoking %s %s %s %s %s %s %s %s",a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7]);
+	  ttf2pt1_main(8,a);
+	  //unlink(tmpFileName);
 	  sprintf(name2,"%s.pfb",tmp);
 	  tmpFileName = strdup(name2);
       }
 
-    return tmpFileName;
+    return strdup(tmpFileName);
 }
 
 char* gfxFontName(GfxFont* gfxFont)
@@ -1277,7 +1292,7 @@ void SWFOutputDev::updateFont(GfxState *state)
     if (gfxFont->getType() == fontType1 ||
 	gfxFont->getType() == fontType1C ||
 	gfxFont->getType() == fontTrueType ||
-	gfxFont->getType() == fontCIDType2) 
+	gfxFont->getType() == fontCIDType2)
     {
 	fileName = writeEmbeddedFontToFile(xref, gfxFont);
 	if(!fileName) {
@@ -1287,7 +1302,7 @@ void SWFOutputDev::updateFont(GfxState *state)
 	}
 	this->t1id = T1_AddFont(fileName);
 	if(this->t1id<0) {
-	  msg("<error> Couldn't load font from file");
+	  msg("<error> Couldn't load font from file %s", fileName);
 	  showFontError(gfxFont,0);
 	  unlinkfont(fileName);
 	  return ;