X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=da2899fe29e5bcad15778f4c5d278b6e54b1961a;hb=06aa9dc1fe16b6965b7ea00dbcfaeb8209cdf1bc;hp=b9454d01522f9d3cc18118b91de5cb526cba5f62;hpb=09fcba365e7453082f476af64067ab4a4506a2c8;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index b9454d0..da2899f 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) CID=%d\n",x,y,dx,dy,c,u, font->isCIDFont());
 
     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,14 +657,13 @@ 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
+	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;
@@ -709,9 +709,12 @@ void SWFOutputDev::startPage(int pageNum, GfxState *state)
 
   state->transform(state->getX1(),state->getY1(),&x1,&y1);
   state->transform(state->getX2(),state->getY2(),&x2,&y2);
+  if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
+  if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
+
   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)));
+    swfoutput_init(&output, swffilename,(int)x1,(int)y1,(int)y2,(int)y2);
     outputstarted = 1;
   }
   else
@@ -983,7 +986,6 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
       int c;
       char *fontBuf;
       int fontLen;
-      Type1CFontFile *cvt;
       Ref embRef;
       Object refObj, strObj;
       char namebuf[512];
@@ -1003,16 +1005,28 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
 	msg("<error> Couldn't create temporary Type 1 font file");
 	  return 0;
       }
-      if (font->getType() == fontType1C) {
+      if (font->getType() == fontType1C ||
+	  font->getType() == fontCIDType0C) {
 	if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
 	  fclose(f);
 	  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);
@@ -1281,9 +1295,11 @@ void SWFOutputDev::updateFont(GfxState *state)
   GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
   if(embedded) {
     if (gfxFont->getType() == fontType1 ||
+	gfxFont->getType() == fontCIDType0C ||
 	gfxFont->getType() == fontType1C ||
 	gfxFont->getType() == fontTrueType ||
-	gfxFont->getType() == fontCIDType2)
+	gfxFont->getType() == fontCIDType2
+	)
     {
 	fileName = writeEmbeddedFontToFile(xref, gfxFont);
 	if(!fileName) {
@@ -1305,6 +1321,7 @@ void SWFOutputDev::updateFont(GfxState *state)
 	   font directories */
 	int newt1id = searchT1Font(fontname);
 	if(newt1id<0) {
+	    msg("<error> Couldn't find any suitable replacement for %s",fontname);
 	    showFontError(gfxFont,0);
 	    fontname = substituteFont(gfxFont, fontname);
 	} else
@@ -1326,7 +1343,8 @@ void SWFOutputDev::updateFont(GfxState *state)
   }
 
   if(t1id<0) {
-      showFontError(gfxFont,0);
+      msg("<error> Current font's t1id is %d", t1id);
+      //showFontError(gfxFont,0);
       return;
   }