int config_filloverlap;
int config_protect;
int config_bboxvars;
+ int config_disable_polygon_conversion;
RGBA config_linkcolor;
float config_minlinewidth;
double config_caplinewidth;
char* config_linktarget;
char*config_internallinkfunction;
+ char*config_externallinkfunction;
SWF* swf;
i->config_caplinewidth=1;
i->config_linktarget=0;
i->config_internallinkfunction=0;
+ i->config_externallinkfunction=0;
i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
i->config_linkcolor.a = 0x40;
i->swflastx += ex;
i->swflasty += ey;
- if(cx || cy || ex || ey) {
- swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
- addPointToBBox(dev, lastlastx ,lastlasty );
- addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
- addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
- }/* else if(!i->fill) {
- // treat splines of length 0 as plots
- plot(dev, lastlastx, lastlasty, tag);
- }*/
+ if((cx || cy) && (ex || ey)) {
+ swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
+ addPointToBBox(dev, lastlastx ,lastlasty );
+ addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+ addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+ } else if(cx || cy || ex || ey) {
+ swf_ShapeSetLine(tag, i->shape, cx+ex,cy+ey);
+ addPointToBBox(dev, lastlastx ,lastlasty );
+ addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+ addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+ }
+
i->shapeisempty = 0;
}
static void stopFill(gfxdevice_t*dev)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
- if(i->lastwasfill)
+ if(i->lastwasfill!=0)
{
swf_ShapeSetStyle(i->tag,i->shape,i->linestyleid,0x8000,0);
i->fillstylechanged = 1;
static void startFill(gfxdevice_t*dev)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
- if(!i->lastwasfill)
+ if(i->lastwasfill!=1)
{
swf_ShapeSetStyle(i->tag,i->shape,0x8000,i->fillstyleid,0);
i->fillstylechanged = 1;
swf_SetShapeBits(i->tag,i->shape);
/* TODO: do we really need this? */
- swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
- i->swflastx=i->swflasty=0;
- i->lastwasfill = 0;
+ //swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
+ //swf_ShapeSetAll(i->tag,i->shape,/*x*/UNDEFINED_COORD,/*y*/UNDEFINED_COORD,i->linestyleid,0,0);
+ i->swflastx=i->swflasty=UNDEFINED_COORD;
+ i->lastwasfill = -1;
i->shapeisempty = 1;
}
if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;}
i->shapeid = -1;
i->bboxrectpos = -1;
+
+// i->currentswfid--; // this was an *exceptionally* bad idea
}
void fixAreas(gfxdevice_t*dev)
if(i->linewidth==0) i->linewidth = 1;
startshape(dev);
+ stopFill(dev);
moveto(dev, i->tag, r.xmin/20.0,r.ymin/20.0);
lineto(dev, i->tag, r.xmax/20.0,r.ymax/20.0);
if(url[t]<'0' || url[t]>'9')
nodigit = 1;
if(!nodigit) {
- int page = atoi(&url[4]) - 1;
+ int page = atoi(&url[4]);
if(page<0) page = 0;
swfoutput_linktopage(dev, page, points);
}
}
void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points)
{
- ActionTAG* actions;
+ ActionTAG* actions = 0;
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
if(i->shapeid>=0)
endshape(dev);
if(i->textid>=0)
endtext(dev);
-
- if(!i->config_linktarget) {
+
+ if(i->config_externallinkfunction) {
+ actions = action_PushString(actions, url); //parameter
+ actions = action_PushInt(actions, 1); //number of parameters (1)
+ actions = action_PushString(actions, i->config_externallinkfunction); //function name
+ actions = action_CallFunction(actions);
+ } else if(!i->config_linktarget) {
if(!i->config_opennewwindow)
- actions = action_GetUrl(0, url, "_parent");
+ actions = action_GetUrl(actions, url, "_parent");
else
- actions = action_GetUrl(0, url, "_this");
+ actions = action_GetUrl(actions, url, "_this");
} else {
- actions = action_GetUrl(0, url, i->config_linktarget);
+ actions = action_GetUrl(actions, url, i->config_linktarget);
}
actions = action_End(actions);
endtext(dev);
if(!i->config_internallinkfunction) {
- actions = action_GotoFrame(actions, page);
+ actions = action_GotoFrame(actions, page-1);
actions = action_End(actions);
} else {
actions = action_PushInt(actions, page); //parameter
actions = action_PushInt(actions, 1); //number of parameters (1)
actions = action_PushString(actions, i->config_internallinkfunction); //function name
actions = action_CallFunction(actions);
+ actions = action_End(actions);
}
drawlink(dev, actions, 0, points,0);
actions1 = action_PushInt(0, 0); //number of parameters (0)
actions1 = action_PushString(actions1, &tmp[5]); //function name
actions1 = action_CallFunction(actions1);
+ actions1 = action_End(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);
+ actions1 = action_End(actions1);
}
actions2 = action_End(0);
mouseover = 0;
i->config_bboxvars = atoi(value);
} else if(!strcmp(name, "internallinkfunction")) {
i->config_internallinkfunction = strdup(value);
+ } else if(!strcmp(name, "externallinkfunction")) {
+ i->config_externallinkfunction = strdup(value);
+ } else if(!strcmp(name, "disable_polygon_conversion")) {
+ i->config_disable_polygon_conversion = atoi(value);
} else if(!strcmp(name, "insertstop")) {
i->config_insertstoptag = atoi(value);
} else if(!strcmp(name, "protect")) {
static int gfxline_has_dots(gfxline_t*line)
{
int tmplines=0;
- double x,y;
+ double x=0,y=0;
double dist = 0;
int isline = 0;
+ int short_gap = 0;
while(line) {
if(line->type == gfx_moveTo) {
- if(isline && dist < 1) {
+ /* test the length of the preceding line, and assume it is a dot if
+ it's length is less than 1.0. But *only* if there's a noticable
+ gap between the previous line and the next moveTo. (I've come
+ across a PDF where thousands of "dots" were stringed together,
+ forming a line) */
+ int last_short_gap = short_gap;
+ if((fabs(line->x - x) + fabs(line->y - y)) < 1.0) {
+ short_gap = 1;
+ } else {
+ short_gap = 0;
+ }
+ if(isline && dist < 1 && !short_gap && !last_short_gap) {
return 1;
}
dist = 0;
y = line->y;
line = line->next;
}
- if(isline && dist < 1) {
+ if(isline && dist < 1 && !short_gap) {
return 1;
}
return 0;
/* TODO: * split line into segments, and perform this check for all segments */
- if(!has_dots &&
- (width <= i->config_caplinewidth
+ if(i->config_disable_polygon_conversion ||
+ (!has_dots &&
+ (width <= i->config_caplinewidth
|| (cap_style == gfx_capRound && joint_style == gfx_joinRound)
- || (cap_style == gfx_capRound && type<=2))) {} else
+ || (cap_style == gfx_capRound && type<=2)))) {} else
{
/* convert line to polygon */
msg("<trace> draw as polygon, type=%d dots=%d", type, has_dots);