X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=38a27111c5572b738e49ddd638b82000fbaca718;hb=98224e6d436b226dc8445db494efa7e8c3635c34;hp=52f64ffb93f7b9ebf63dc12b99b04d31862282f7;hpb=3b6a15452be7b300bc7be5a7927b4b210e7cc732;p=swftools.git

diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc
index 52f64ff..38a2711 100644
--- a/pdf2swf/swfoutput.cc
+++ b/pdf2swf/swfoutput.cc
@@ -36,6 +36,8 @@ int drawonlyshapes=0;
 int jpegquality=85;
 int storeallcharacters=0;
 int enablezlib=0;
+int insertstoptag=0;
+int flashversion=4;
 static int flag_protected = 0;
 
 typedef unsigned char u8;
@@ -450,7 +452,7 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha
     }
     else
     {
-        T1_OUTLINE*outline = font->getOutline(character);
+        T1_OUTLINE*outline = font->getOutline(character, charnr);
         char* charname = character;
 
         if(!outline) {
@@ -646,7 +648,7 @@ SWFFont::~SWFFont()
 
             swflastx=0;
             swflasty=0;
-            swf_SetU8(ftag,0x10); //0 fill bits, 0 linestyle bits
+            swf_SetU8(ftag,0x10); //1 fill bits, 0 linestyle bits
             SHAPE s;
             s.bits.fill = 1;
             s.bits.line = 0;
@@ -698,40 +700,51 @@ SWFFont::~SWFFont()
     free(char2swfcharid);
 }
 
-T1_OUTLINE*SWFFont::getOutline(char*name)
+T1_OUTLINE*SWFFont::getOutline(char*name, int charnr)
 {
     int t;
     for(t=0;t<this->charnum;t++) {
         if(!strcmp(this->charname[t],name)) {
-            if(!used[t])
-            {
-                swfcharid2char[swfcharpos] = t;
-                char2swfcharid[t] = swfcharpos;
-                swfcharpos++;
-                used[t] = 1;
-            }
             return outline[t];
         }
     }
+    
+    /* if we didn't find the character, maybe
+       we can find the capitalized version */
+    for(t=0;t<this->charnum;t++) {
+        if(!strcasecmp(this->charname[t],name))
+	    return outline[t];
+    }
+
+    /* if we didn't find it by name, use the names of the first 256 characters
+       of the font to try a new name based on charnr */
+    if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) {
+	return getOutline(this->standardtable[charnr], -1);
+    }
+
+    logf("<warning> Didn't find character '%s' in font '%s'", FIXNULL(name), this->name);
     return 0;
 }
 
-int SWFFont::getWidth(char*name)
+int SWFFont::getSWFCharID(char*name, int charnr)
 {
     int t;
     for(t=0;t<this->charnum;t++) {
         if(!strcmp(this->charname[t],name)) {
-            return this->width[t];
+            if(!used[t])
+            {
+                swfcharid2char[swfcharpos] = t;
+                char2swfcharid[t] = swfcharpos++;
+                used[t] = 1;
+            }
+            return char2swfcharid[t];
         }
     }
-    return 0;
-}
 
-int SWFFont::getSWFCharID(char*name, int charnr)
-{
-    int t;
+    /* if we didn't find the character, maybe
+       we can find the capitalized version */
     for(t=0;t<this->charnum;t++) {
-        if(!strcmp(this->charname[t],name)) {
+        if(!strcasecmp(this->charname[t],name)) {
             if(!used[t])
             {
                 swfcharid2char[swfcharpos] = t;
@@ -741,6 +754,9 @@ int SWFFont::getSWFCharID(char*name, int charnr)
             return char2swfcharid[t];
         }
     }
+
+    /* if we didn't find it by name, use the names of the first 256 (or so) characters
+       of the font to try a new name based on charnr */
     if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) {
 	return getSWFCharID(this->standardtable[charnr], -1);
     }
@@ -748,6 +764,17 @@ int SWFFont::getSWFCharID(char*name, int charnr)
     return 0;
 }
 
+int SWFFont::getWidth(char*name)
+{
+    int t;
+    for(t=0;t<this->charnum;t++) {
+        if(!strcmp(this->charname[t],name)) {
+            return this->width[t];
+        }
+    }
+    return 0;
+}
+
 char*SWFFont::getName()
 {
     return this->name;
@@ -854,7 +881,7 @@ void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size
   
   memset(&swf,0x00,sizeof(SWF));
 
-  swf.fileVersion    = 4;
+  swf.fileVersion    = flashversion;
   swf.frameRate      = 0x0040; // 1 frame per 4 seconds
   swf.movieSize.xmax = 20*sizex;
   swf.movieSize.ymax = 20*sizey;
@@ -969,6 +996,14 @@ static void endpage(struct swfoutput*obj)
       endtext();
     while(clippos)
         swfoutput_endclip(obj);
+
+    if(insertstoptag) {
+	ActionTAG*atag=0;
+	atag = action_Stop(atag);
+	atag = action_End(atag);
+	tag = swf_InsertTag(tag,ST_DOACTION);
+	swf_ActionSet(tag,atag);
+    }
     tag = swf_InsertTag(tag,ST_SHOWFRAME);
 }
 
@@ -1131,19 +1166,26 @@ static void drawlink(struct swfoutput*obj, ActionTAG*,ActionTAG*, swfcoord*point
 void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points)
 {
     ActionTAG* actions;
+    if(!strncmp("http://pdf2swf:", url, 15)) {
+     char*tmp = strdup(url);
+     int l = strlen(tmp);
+     if(tmp[l-1] == '/')
+        tmp[l-1] = 0;
+     swfoutput_namedlink(obj, tmp+15, points);
+     free(tmp);
+     return;
+    }
     
     if(shapeid>=0)
      endshape();
     if(textid>=0)
      endtext();
     
-    actions = swf_ActionStart();
     if(opennewwindow)
-      action_GetUrl(url, "_parent");
+      actions = action_GetUrl(0, url, "_parent");
     else
-      action_GetUrl(url, "_this");
-      action_End();
-    swf_ActionEnd();
+      actions = action_GetUrl(0, url, "_this");
+    actions = action_End(actions);
     
     drawlink(obj, actions, 0, points,0);
 }
@@ -1156,40 +1198,61 @@ void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points)
     if(textid>=0)
      endtext();
    
-    actions = swf_ActionStart();
-      action_GotoFrame(page);
-      action_End();
-    swf_ActionEnd();
+      actions = action_GotoFrame(0, page);
+      actions = action_End(actions);
 
     drawlink(obj, actions, 0, points,0);
 }
+
+/* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets
+   of the viewer objects, like subtitles, index elements etc.
+*/
 void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points)
 {
     ActionTAG *actions1,*actions2;
+    char*tmp = strdup(name);
+    char mouseover = 1;
 
     if(shapeid>=0)
      endshape();
     if(textid>=0)
      endtext();
-   
-    actions1 = swf_ActionStart();
-      action_PushString("/:subtitle");
-      action_PushString(name);
-      action_SetVariable();
-      action_End();
-    swf_ActionEnd();
-
-    actions2 = swf_ActionStart();
-      action_PushString("/:subtitle");
-      action_PushString("");
-      action_SetVariable();
-      action_End();
-    swf_ActionEnd();
-
-    drawlink(obj, actions1, actions2, points,1);
+
+    if(!strncmp(tmp, "call:", 5))
+    {
+	char*x = strchr(&tmp[5], ':');
+	if(!x) {
+	    actions1 = action_PushInt(0, 0); //number of parameters (0)
+	    actions1 = action_PushString(actions1, &tmp[5]); //function name
+	    actions1 = action_CallFunction(actions1);
+	} else {
+	    *x = 0;
+	    actions1 = action_PushString(0, x+1); //parameter
+	    actions1 = action_PushInt(actions1, 1); //number of parameters (1)
+	    actions1 = action_PushString(actions1, &tmp[5]); //function name
+	    actions1 = action_CallFunction(actions1);
+	}
+	actions2 = action_End(0);
+	mouseover = 0;
+    }
+    else
+    {
+	actions1 = action_PushString(0, "/:subtitle");
+	actions1 = action_PushString(actions1, name);
+	actions1 = action_SetVariable(actions1);
+	actions1 = action_End(actions1);
+
+	actions2 = action_PushString(0, "/:subtitle");
+	actions2 = action_PushString(actions2, "");
+	actions2 = action_SetVariable(actions2);
+	actions2 = action_End(actions2);
+    }
+
+    drawlink(obj, actions1, actions2, points,mouseover);
 
     swf_ActionFree(actions1);
     swf_ActionFree(actions2);
+    free(tmp);
 }
 
 static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions2, swfcoord*points, char mouseover)
@@ -1351,23 +1414,28 @@ static void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey,
     if(y4>ymax) ymax=y4;
     if(x4<xmin) xmin=x4;
     if(y4<ymin) ymin=y4;
-    p1.x=x1;
-    p1.y=y1;
-    p2.x=x2;
-    p2.y=y2;
-    p3.x=x3;
-    p3.y=y3;
-    p4.x=x4;
-    p4.y=y4;
+    p1.x=x1; p1.y=y1;
+    p2.x=x2; p2.y=y2;
+    p3.x=x3; p3.y=y3;
+    p4.x=x4; p4.y=y4;
+
+    {p1.x = (int)(p1.x*20)/20.0;
+     p1.y = (int)(p1.y*20)/20.0;
+     p2.x = (int)(p2.x*20)/20.0;
+     p2.y = (int)(p2.y*20)/20.0;
+     p3.x = (int)(p3.x*20)/20.0;
+     p3.y = (int)(p3.y*20)/20.0;
+     p4.x = (int)(p4.x*20)/20.0;
+     p4.y = (int)(p4.y*20)/20.0;}
     
     MATRIX m;
-    m.sx = (int)(65536*20*(x4-x1))/sizex;
-    m.r1 = -(int)(65536*20*(y4-y1))/sizex;
-    m.r0 = (int)(65536*20*(x1-x2))/sizey;
-    m.sy = -(int)(65536*20*(y1-y2))/sizey;
+    m.sx = (int)(65536*20*(p4.x-p1.x)/sizex);
+    m.r1 = -(int)(65536*20*(p4.y-p1.y)/sizex);
+    m.r0 = (int)(65536*20*(p1.x-p2.x)/sizey);
+    m.sy = -(int)(65536*20*(p1.y-p2.y)/sizey);
 
-    m.tx = (int)(x1*20);
-    m.ty = (int)(y1*20);
+    m.tx = (int)(p1.x*20);
+    m.ty = (int)(p1.y*20);
   
     /* shape */
     myshapeid = ++currentswfid;
@@ -1375,7 +1443,7 @@ static void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey,
     swf_ShapeNew(&shape);
     //lsid = ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb);
     //fsid = ShapeAddSolidFillStyle(shape,&obj->fillrgb);
-    fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,0);
+    fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1);
     swf_SetU16(tag, myshapeid);
     r.xmin = (int)(xmin*20);
     r.ymin = (int)(ymin*20);
@@ -1480,11 +1548,11 @@ int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int si
     return bitid;
 }
 
-int swfoutput_drawimagelossless256(struct swfoutput*obj, U8*mem, RGBA*pal, int sizex,int sizey, 
+int swfoutput_drawimagelosslessN(struct swfoutput*obj, U8*mem, RGBA*pal, int sizex,int sizey, 
         double x1,double y1,
         double x2,double y2,
         double x3,double y3,
-        double x4,double y4)
+        double x4,double y4, int n)
 {
     TAG*oldtag;
     U8*mem2 = 0;
@@ -1496,7 +1564,6 @@ int swfoutput_drawimagelossless256(struct swfoutput*obj, U8*mem, RGBA*pal, int s
     if(sizex&3)
     { 
 	/* SWF expects scanlines to be 4 byte aligned */
-	printf("%d -> %d\n", sizex, BYTES_PER_SCANLINE(sizex));
 	int x,y;
 	U8*ptr;
 	mem2 = (U8*)malloc(BYTES_PER_SCANLINE(sizex)*sizey);
@@ -1514,7 +1581,7 @@ int swfoutput_drawimagelossless256(struct swfoutput*obj, U8*mem, RGBA*pal, int s
     oldtag = tag;
     tag = swf_InsertTag(tag,ST_DEFINEBITSLOSSLESS2);
     swf_SetU16(tag, bitid);
-    if(swf_SetLosslessBitsIndexed(tag,sizex,sizey,mem, pal, 256)<0) {
+    if(swf_SetLosslessBitsIndexed(tag,sizex,sizey,mem, pal, n)<0) {
 	swf_DeleteTag(tag);
 	tag = oldtag;
 	return -1;