X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=dc5ddad4932391084e25ebf9a31bac7055faaf32;hb=b2a60b691211c3ad3eb8005fb89573b030dadec8;hp=2809efcb14037f96ac0843788ed4940d600f3edc;hpb=fd9d112727d70722bf2702eb14c2dd9cc2c554e1;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 2809efc..dc5ddad 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -144,7 +144,7 @@ public:
   void startDoc(XRef *xref);
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state) ;
+  virtual void startPage(int pageNum, GfxState *state, double x1, double y1, double x2, double y2) ;
 
   //----- link borders
   virtual void drawLink(Link *link, Catalog *catalog) ;
@@ -224,6 +224,22 @@ public:
   GfxState *laststate;
 };
 
+char*getFontName(GfxFont*font)
+{
+    GString*gstr = font->getName();
+    char* fontname = gstr==0?0:gstr->getCString();
+    if(fontname==0) {
+	char buf[32];
+	Ref*r=font->getID();
+	sprintf(buf, "UFONT%d", r->num);
+	return strdup(buf);
+    }
+    char* plus = strchr(fontname, '+');
+    if(plus && plus < &fontname[strlen(fontname)-1])
+	fontname = plus+1;
+    return fontname;
+}
+
 char mybuf[1024];
 char* gfxstate2str(GfxState *state)
 {
@@ -303,8 +319,8 @@ char* gfxstate2str(GfxState *state)
   if(state->getLineJoin()!=0)
   bufpos+=sprintf(bufpos,"ML%d ", state->getMiterLimit());
 
-  if(state->getFont() && state->getFont()->getName() && state->getFont()->getName()->getCString())
-  bufpos+=sprintf(bufpos,"F\"%s\" ",((state->getFont())->getName())->getCString());
+  if(state->getFont() && getFontName(state->getFont()))
+  bufpos+=sprintf(bufpos,"F\"%s\" ",getFontName(state->getFont()));
   bufpos+=sprintf(bufpos,"FS%.1f ", state->getFontSize());
   bufpos+=sprintf(bufpos,"MAT[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f] ", state->getTextMat()[0],state->getTextMat()[1],state->getTextMat()[2],
 	                           state->getTextMat()[3],state->getTextMat()[4],state->getTextMat()[5]);
@@ -331,6 +347,8 @@ char* gfxstate2str(GfxState *state)
   return mybuf;
 }
 
+
+
 void dumpFontInfo(char*loglevel, GfxFont*font);
 int lastdumps[1024];
 int lastdumppos = 0;
@@ -360,15 +378,13 @@ void showFontError(GfxFont*font, int nr)
 
 void dumpFontInfo(char*loglevel, GfxFont*font)
 {
-  GString *gstr;
-  char*name = 0;
-  gstr = font->getName();
+  char* name = getFontName(font);
   Ref* r=font->getID();
-  msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, gstr?FIXNULL(gstr->getCString()):"(unknown font)", r->num,r->gen);
+  msg("%s=========== %s (ID:%d,%d) ==========\n", loglevel, name, r->num,r->gen);
 
-  gstr  = font->getTag();
-  if(gstr) 
-   msg("%sTag: %s\n", loglevel, FIXNULL(gstr->getCString()));
+  GString*gstr  = font->getTag();
+   
+  msg("%sTag: %s\n", loglevel, name);
   
   if(font->isCIDFont()) msg("%sis CID font\n", loglevel);
 
@@ -700,18 +716,28 @@ void SWFOutputDev::endType3Char(GfxState *state)
     msg("<debug> endType3Char");
 }
 
-void SWFOutputDev::startPage(int pageNum, GfxState *state) 
+void SWFOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2) 
 {
   double x1,y1,x2,y2;
   laststate = state;
-  msg("<debug> startPage %d\n", pageNum);
+  msg("<verbose> startPage %d (%f,%f,%f,%f)\n", pageNum, crop_x1, crop_y1, crop_x2, crop_y2);
   msg("<notice> processing page %d", pageNum);
 
-  state->transform(state->getX1(),state->getY1(),&x1,&y1);
+  /* state->transform(state->getX1(),state->getY1(),&x1,&y1);
   state->transform(state->getX2(),state->getY2(),&x2,&y2);
+  Use CropBox, not MediaBox, as page size
+  */
+  x1 = crop_x1;
+  y1 = crop_y1;
+  x2 = crop_x2;
+  y2 = crop_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)x2,(int)y2);
     outputstarted = 1;
   }
   else
@@ -1088,20 +1114,6 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
     return strdup(tmpFileName);
 }
 
-char* gfxFontName(GfxFont* gfxFont)
-{
-      GString *gstr;
-      gstr = gfxFont->getName();
-      if(gstr) {
-	  return gstr->getCString();
-      }
-      else {
-	  char buf[32];
-	  Ref*r=gfxFont->getID();
-	  sprintf(buf, "UFONT%d", r->num);
-	  return strdup(buf);
-      }
-}
 
 char* substitutetarget[256];
 char* substitutesource[256];
@@ -1121,7 +1133,7 @@ char* SWFOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
     if(oldname) {
 	substitutesource[substitutepos] = oldname;
 	substitutetarget[substitutepos] = fontname;
-	msg("<verbose> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
+	msg("<notice> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
 	substitutepos ++;
     }
     return fontname;
@@ -1258,7 +1270,7 @@ void SWFOutputDev::updateFont(GfxState *state)
   if (!gfxFont) {
     return;
   }  
-  char * fontname = gfxFontName(gfxFont);
+  char * fontname = getFontName(gfxFont);
  
   int t;
   /* first, look if we substituted this font before-