#include "../lib/log.h"
#include "../lib/rfxswf.h"
}
-#define standardEncodingSize 335
-extern char *standardEncodingNames[standardEncodingSize];
-
-int opennewwindow=0;
-int ignoredraworder=0;
-int drawonlyshapes=0;
-int jpegquality=85;
-int storeallcharacters=0;
-int enablezlib=0;
-int insertstoptag=0;
-int flashversion=4;
-int splinemaxerror=1;
-int fontsplinemaxerror=1;
-static int flag_protected = 0;
-
-typedef unsigned char u8;
-typedef unsigned short int u16;
-typedef unsigned long int u32;
-
-static int fi;
-static char* filename = 0;
-static SWF swf;
-static TAG *tag;
-static int currentswfid = 0;
-static int depth = 1;
-static int startdepth = 1;
-
-static SHAPE* shape;
-static int shapeid = -1;
-static int textid = -1;
-
-static int drawmode = -1;
-static char storefont = 0;
-static int fillstyleid;
-static int linestyleid;
-static int swflastx=0;
-static int swflasty=0;
-static int lastwasfill = 0;
-static char fill = 0;
-static int sizex;
-static int sizey;
-TAG* cliptags[128];
-int clipshapes[128];
-u32 clipdepths[128];
-int clippos = 0;
-
-int CHARMIDX = 0;
-int CHARMIDY = 0;
-
-char fillstylechanged = 0;
+
+#define CHARDATAMAX 8192
+#define CHARMIDX 0
+#define CHARMIDY 0
+
+typedef struct _chardata {
+ int charid;
+ int fontid; /* TODO: use a SWFFONT instead */
+ int x;
+ int y;
+ int size;
+ RGBA color;
+} chardata_t;
+
+struct fontlist_t
+{
+ SWFFONT *swffont;
+ fontlist_t*next;
+};
+
+int config_opennewwindow=0;
+int config_ignoredraworder=0;
+int config_drawonlyshapes=0;
+int config_jpegquality=85;
+int config_storeallcharacters=0;
+int config_enablezlib=0;
+int config_insertstoptag=0;
+int config_flashversion=5;
+int config_splinemaxerror=1;
+int config_fontsplinemaxerror=1;
+int config_filloverlap=0;
+int config_protect=0;
+float config_minlinewidth=0.05;
+
+typedef struct _swfoutput_internal
+{
+ SWF swf;
+
+ fontlist_t* fontlist;
+
+ char storefont;
+
+ MATRIX page_matrix;
+
+ TAG *tag;
+ int currentswfid;
+ int depth;
+ int startdepth;
+ int linewidth;
+
+ SHAPE* shape;
+ int shapeid;
+ int textid;
+
+ int fillstyleid;
+ int linestyleid;
+ int swflastx;
+ int swflasty;
+ int lastwasfill;
+ int shapeisempty;
+ char fill;
+ int min_x,max_x;
+ int min_y,max_y;
+ TAG* cliptags[128];
+ int clipshapes[128];
+ U32 clipdepths[128];
+ int clippos;
+
+ int frameno;
+ int lastframeno;
+
+ char fillstylechanged;
+
+ int bboxrectpos;
+ SRECT bboxrect;
+
+ TAG*cliptag;
+
+ chardata_t chardata[CHARDATAMAX];
+ int chardatapos;
+ int firstpage;
+ char pagefinished;
+} swfoutput_internal;
+
+static swfoutput_internal* init_internal_struct()
+{
+ swfoutput_internal*i = (swfoutput_internal*)malloc(sizeof(swfoutput_internal));
+ memset(i, 0, sizeof(swfoutput_internal));
+
+
+ i->storefont = 0;
+ i->currentswfid = 0;
+ i->depth = 1;
+ i->startdepth = 1;
+ i->linewidth = 0;
+ i->shapeid = -1;
+ i->textid = -1;
+ i->frameno = 0;
+ i->lastframeno = 0;
+
+ i->fillstyleid;
+ i->linestyleid;
+ i->swflastx=0;
+ i->swflasty=0;
+ i->lastwasfill = 0;
+ i->shapeisempty = 1;
+ i->fill = 0;
+ i->clippos = 0;
+
+ i->fillstylechanged = 0;
+
+ i->bboxrectpos = -1;
+ i->chardatapos = 0;
+ i->firstpage = 1;
+ i->pagefinished = 1;
+
+ return i;
+};
static void startshape(struct swfoutput* obj);
static void starttext(struct swfoutput* obj);
-static void endshape();
-static void endtext();
+static void endshape(struct swfoutput* obj,int clip);
+static void endtext(struct swfoutput* obj);
// matrix multiplication. changes p0
static void transform (plotxy*p0,struct swfmatrix*m)
}
// write a move-to command into the swf
-static int moveto(TAG*tag, plotxy p0)
+static int moveto(struct swfoutput*obj, TAG*tag, plotxy p0)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
int rx = (int)(p0.x*20);
int ry = (int)(p0.y*20);
- if(rx!=swflastx || ry!=swflasty || fillstylechanged) {
- swf_ShapeSetMove (tag, shape, rx,ry);
- fillstylechanged = 0;
- swflastx=rx;
- swflasty=ry;
+ if(rx!=i->swflastx || ry!=i->swflasty || i->fillstylechanged) {
+ swf_ShapeSetMove (tag, i->shape, rx,ry);
+ i->fillstylechanged = 0;
+ i->swflastx=rx;
+ i->swflasty=ry;
return 1;
}
return 0;
}
+static int moveto(struct swfoutput*obj, TAG*tag, float x, float y)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ plotxy p;
+ p.x = x;
+ p.y = y;
+ return moveto(obj, tag, p);
+}
+static void addPointToBBox(struct swfoutput*obj, int px, int py)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+
+ SPOINT p;
+ p.x = px;
+ p.y = py;
+ if(i->fill) {
+ swf_ExpandRect(&i->bboxrect, p);
+ } else {
+ swf_ExpandRect3(&i->bboxrect, p, i->linewidth*3/2);
+ }
+}
// write a line-to command into the swf
-static void lineto(TAG*tag, plotxy p0)
+static void lineto(struct swfoutput*obj, TAG*tag, plotxy p0)
{
- int rx = ((int)(p0.x*20)-swflastx);
- int ry = ((int)(p0.y*20)-swflasty);
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ int px = (int)(p0.x*20);
+ int py = (int)(p0.y*20);
+ int rx = (px-i->swflastx);
+ int ry = (py-i->swflasty);
/* we can't skip this for rx=0,ry=0, those
are plots */
- swf_ShapeSetLine (tag, shape, rx,ry);
- swflastx+=rx;
- swflasty+=ry;
+ swf_ShapeSetLine (tag, i->shape, rx,ry);
+
+ addPointToBBox(obj, i->swflastx,i->swflasty);
+ addPointToBBox(obj, px,py);
+
+ i->shapeisempty = 0;
+ i->swflastx+=rx;
+ i->swflasty+=ry;
+}
+static void lineto(struct swfoutput*obj, TAG*tag, double x, double y)
+{
+ plotxy p;
+ p.x = x;
+ p.y = y;
+ lineto(obj,tag, p);
}
// write a spline-to command into the swf
-static void splineto(TAG*tag, plotxy control,plotxy end)
+static void splineto(struct swfoutput*obj, TAG*tag, plotxy control,plotxy end)
{
- int cx = ((int)(control.x*20)-swflastx);
- int cy = ((int)(control.y*20)-swflasty);
- swflastx += cx;
- swflasty += cy;
- int ex = ((int)(end.x*20)-swflastx);
- int ey = ((int)(end.y*20)-swflasty);
- swflastx += ex;
- swflasty += ey;
- if(cx || cy || ex || ey)
- swf_ShapeSetCurve(tag, shape, cx,cy,ex,ey);
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ int lastlastx = i->swflastx;
+ int lastlasty = i->swflasty;
+
+ int cx = ((int)(control.x*20)-i->swflastx);
+ int cy = ((int)(control.y*20)-i->swflasty);
+ i->swflastx += cx;
+ i->swflasty += cy;
+ int ex = ((int)(end.x*20)-i->swflastx);
+ int ey = ((int)(end.y*20)-i->swflasty);
+ i->swflastx += ex;
+ i->swflasty += ey;
+
+ if(cx || cy || ex || ey) {
+ swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
+ addPointToBBox(obj, lastlastx ,lastlasty );
+ addPointToBBox(obj, lastlastx+cx,lastlasty+cy);
+ addPointToBBox(obj, lastlastx+cx+ex,lastlasty+cy+ey);
+ }
+ i->shapeisempty = 0;
}
/* write a line, given two points and the transformation
matrix. */
-static void line(TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m)
+static void line(struct swfoutput*obj, TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m)
{
transform(&p0,m);
transform(&p1,m);
- moveto(tag, p0);
- lineto(tag, p1);
+ moveto(obj, tag, p0);
+ lineto(obj, tag, p1);
}
/* write a cubic (!) spline. This involves calling the approximate()
function out of spline.cc to convert it to a quadratic spline. */
-static void spline(TAG*tag,plotxy p0,plotxy p1,plotxy p2,plotxy p3,struct swfmatrix*m)
+static void spline(struct swfoutput*obj, TAG*tag,plotxy p0,plotxy p1,plotxy p2,plotxy p3,struct swfmatrix*m)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
double d;
struct qspline q[128];
int num;
c.control2 = p1;
c.end = p0;
- if(storefont) {
+ if(i->storefont) {
/* fonts use a different approximation than shapes */
- num = cspline_approximate(&c, q, fontsplinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY);
+ num = cspline_approximate(&c, q, config_fontsplinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY);
//num = cspline_approximate(&c, q, 10.0, APPROXIMATE_INFLECTION);
} else {
- num = cspline_approximate(&c, q, splinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY);
+ num = cspline_approximate(&c, q, config_splinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY);
}
for(t=0;t<num;t++) {
if(!t)
- moveto(tag,q[t].start);
- splineto(tag,q[t].control, q[t].end);
+ moveto(obj, tag,q[t].start);
+ splineto(obj, tag,q[t].control, q[t].end);
}
}
-void resetdrawer()
+void resetdrawer(struct swfoutput*obj)
{
- swflastx = 0;
- swflasty = 0;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ i->swflastx = 0;
+ i->swflasty = 0;
}
-static void stopFill()
+static void stopFill(struct swfoutput*obj)
{
- if(lastwasfill)
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->lastwasfill)
{
- swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0);
- fillstylechanged = 1;
- lastwasfill = 0;
+ swf_ShapeSetStyle(i->tag,i->shape,i->linestyleid,0x8000,0);
+ i->fillstylechanged = 1;
+ i->lastwasfill = 0;
}
}
-static void startFill()
+static void startFill(struct swfoutput*obj)
{
- if(!lastwasfill)
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(!i->lastwasfill)
{
- swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0);
- fillstylechanged = 1;
- lastwasfill = 1;
+ swf_ShapeSetStyle(i->tag,i->shape,0x8000,i->fillstyleid,0);
+ i->fillstylechanged = 1;
+ i->lastwasfill = 1;
}
}
-/* draw a T1 outline. These are generated by pdf2swf and by t1lib
+/* draw an outline. These are generated by pdf2swf and by t1lib
(representing characters). */
-void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log)
+void drawpath(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int log)
{
- if(tag->id != ST_DEFINEFONT &&
- tag->id != ST_DEFINESHAPE &&
- tag->id != ST_DEFINESHAPE2 &&
- tag->id != ST_DEFINESHAPE3)
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if( i->tag->id != ST_DEFINESHAPE &&
+ i->tag->id != ST_DEFINESHAPE2 &&
+ i->tag->id != ST_DEFINESHAPE3)
{
- msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
+ msg("<error> internal error: drawpath needs a shape tag, not %d\n",i->tag->id);
exit(1);
}
double x=0,y=0;
{
x += (outline->dest.x/(float)0xffff);
y += (outline->dest.y/(float)0xffff);
- if(outline->type == T1_PATHTYPE_MOVE)
+ if(outline->type == SWF_PATHTYPE_MOVE)
{
+ //if(!init && fill && obj->drawmode != DRAWMODE_EOFILL && !ignoredraworder) {
+ if(config_filloverlap && !init && i->fill && obj->drawmode != DRAWMODE_EOFILL) {
+ /* drawmode=FILL (not EOFILL) means that
+ seperate shapes do not cancel each other out.
+ On SWF side, we need to start a new shape for each
+ closed polygon, because SWF only knows EOFILL.
+ */
+ endshape(obj,0);
+ startshape(obj);
+ startFill(obj);
+ }
+
if(((int)(lastx*20) != (int)(firstx*20) ||
(int)(lasty*20) != (int)(firsty*20)) &&
- fill && !init)
+ i->fill && !init)
{
plotxy p0;
plotxy p1;
p1.x=firstx;
p1.y=firsty;
if(log) printf("fix: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y);
- line(tag, p0, p1, m);
+ line(obj,i->tag, p0, p1, m);
}
firstx=x;
firsty=y;
init = 0;
}
- else if(outline->type == T1_PATHTYPE_LINE)
+ else if(outline->type == SWF_PATHTYPE_LINE)
{
plotxy p0;
plotxy p1;
p1.x=x;
p1.y=y;
if(log) printf("line: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y);
- line(tag, p0,p1,m);
+ line(obj,i->tag, p0,p1,m);
}
- else if(outline->type == T1_PATHTYPE_BEZIER)
+ else if(outline->type == SWF_PATHTYPE_BEZIER)
{
plotxy p0;
plotxy p1;
plotxy p2;
plotxy p3;
- T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline;
+ SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline;
p0.x=x;
p0.y=y;
p1.x=o2->C.x/(float)0xffff+lastx;
p3.x=lastx;
p3.y=lasty;
if(log) printf("spline: %f,%f -> %f,%f\n",p3.x,p3.y,p0.x,p0.y);
- spline(tag,p0,p1,p2,p3,m);
+ spline(obj,i->tag,p0,p1,p2,p3,m);
}
else {
msg("<error> drawpath: unknown outline type:%d\n", outline->type);
}
if(((int)(lastx*20) != (int)(firstx*20) ||
(int)(lasty*20) != (int)(firsty*20)) &&
- fill)
+ i->fill)
{
plotxy p0;
plotxy p1;
p1.x=firstx;
p1.y=firsty;
if(log) printf("fix: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y);
- line(tag, p0, p1, m);
+ line(obj, i->tag, p0, p1, m);
}
}
-plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int trytwo)
+plotxy getPivot(struct swfoutput*obj, SWF_OUTLINE*outline, int dir, double line_width, int end, int trytwo)
{
- T1_PATHPOINT next, next2;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ SWF_PATHPOINT next, next2;
double xv=0,yv=0, xv2=0, yv2=0;
plotxy p;
int two = 0;
if(!end) {
- if(outline->type == T1_PATHTYPE_LINE) {
+ if(outline->type == SWF_PATHTYPE_LINE) {
next = outline->dest;
} else {
- next = ((T1_BEZIERSEGMENT*)outline)->B;
+ next = ((SWF_BEZIERSEGMENT*)outline)->B;
if(next.x==0 && next.y==0) {
- next = ((T1_BEZIERSEGMENT*)outline)->C;
+ next = ((SWF_BEZIERSEGMENT*)outline)->C;
}
if(next.x==0 && next.y==0) {
- next = ((T1_BEZIERSEGMENT*)outline)->dest;
+ next = ((SWF_BEZIERSEGMENT*)outline)->dest;
}
}
next2 = next;
- if(trytwo && outline->last && outline->last->type != T1_PATHTYPE_MOVE) {
- if(outline->type == T1_PATHTYPE_LINE) {
+ if(trytwo && outline->last && outline->last->type != SWF_PATHTYPE_MOVE) {
+ if(outline->type == SWF_PATHTYPE_LINE) {
next2 = outline->last->dest;
} else {
- T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)(outline->last))->C;
- T1_PATHPOINT b = ((T1_BEZIERSEGMENT*)(outline->last))->B;
+ SWF_PATHPOINT c = ((SWF_BEZIERSEGMENT*)(outline->last))->C;
+ SWF_PATHPOINT b = ((SWF_BEZIERSEGMENT*)(outline->last))->B;
next2.x = outline->last->dest.x - c.x;
next2.y = outline->last->dest.y - c.y;
if(next2.x==0 && next2.y==0) {
two = 1;
}
} else {
- if(outline->type == T1_PATHTYPE_LINE) {
+ if(outline->type == SWF_PATHTYPE_LINE) {
next = outline->dest;
} else {
- T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)outline)->C;
- T1_PATHPOINT b = ((T1_BEZIERSEGMENT*)outline)->B;
+ SWF_PATHPOINT c = ((SWF_BEZIERSEGMENT*)outline)->C;
+ SWF_PATHPOINT b = ((SWF_BEZIERSEGMENT*)outline)->B;
next.x = outline->dest.x - c.x;
next.y = outline->dest.y - c.y;
if(next.x==0 && next.y==0) {
}
}
next2 = next;
- if(trytwo && outline->link && outline->link->type != T1_PATHTYPE_MOVE) {
- if(outline->type == T1_PATHTYPE_LINE) {
+ if(trytwo && outline->link && outline->link->type != SWF_PATHTYPE_MOVE) {
+ if(outline->type == SWF_PATHTYPE_LINE) {
next2 = outline->link->dest;
} else {
- next2 = ((T1_BEZIERSEGMENT*)(outline->link))->B;
+ next2 = ((SWF_BEZIERSEGMENT*)(outline->link))->B;
if(next2.x==0 && next2.y==0) {
- next2 = ((T1_BEZIERSEGMENT*)outline->link)->C;
+ next2 = ((SWF_BEZIERSEGMENT*)outline->link)->C;
}
if(next2.x==0 && next2.y==0) {
- next2 = ((T1_BEZIERSEGMENT*)outline->link)->dest;
+ next2 = ((SWF_BEZIERSEGMENT*)outline->link)->dest;
}
}
two = 1;
return p;
}
-void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline)
+void drawShortPath(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
double lastx=x, lasty=y;
- while (outline && outline->type != T1_PATHTYPE_MOVE)
+ while (outline && outline->type != SWF_PATHTYPE_MOVE)
{
x += (outline->dest.x/(float)0xffff);
y += (outline->dest.y/(float)0xffff);
- if(outline->type == T1_PATHTYPE_LINE)
+ if(outline->type == SWF_PATHTYPE_LINE)
{
plotxy p0, p1;
p0.x=lastx;
p0.y=lasty;
p1.x= x;
p1.y= y;
- line(tag, p0, p1, m);
+ line(obj, i->tag, p0, p1, m);
}
- else if(outline->type == T1_PATHTYPE_BEZIER)
+ else if(outline->type == SWF_PATHTYPE_BEZIER)
{
plotxy p0,p1,p2,p3;
- T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline;
+ SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline;
p3.x=lastx;
p3.y=lasty;
p1.x=o2->C.x/(float)0xffff+lastx;
p2.y=o2->B.y/(float)0xffff+lasty;
p0.x=x;
p0.y=y;
- spline(tag,p0,p1,p2,p3,m);
+ spline(obj, i->tag,p0,p1,p2,p3,m);
}
lastx=x;
lasty=y;
}
}
-void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width)
+void drawShortPathWithEnds(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
plotxy d,d2;
int back = 0;
if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) {
- endshape();
- startshape(output);
- T1_OUTLINE *last, *tmp=outline;
+ endshape(obj,0);
+ startshape(obj);
+ SWF_OUTLINE *last, *tmp=outline;
plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3;
double x2 = x;
double y2 = y;
double lx=x,ly=y;
double ee = 1.0;
int nr;
- while(tmp && tmp->type != T1_PATHTYPE_MOVE) {
+ while(tmp && tmp->type != SWF_PATHTYPE_MOVE) {
last = tmp;
lx += (tmp->dest.x/(float)0xffff);
ly += (tmp->dest.y/(float)0xffff);
tmp = tmp->link;
}
- s = getPivot(outline, 0, line_width, 0, 0);
- e = getPivot(last, 0, line_width, 1, 0);
+ s = getPivot(obj, outline, 0, line_width, 0, 0);
+ e = getPivot(obj, last, 0, line_width, 1, 0);
if(line_cap == LINE_CAP_BUTT) {
/* make the clipping rectangle slighly bigger
for(nr=0;nr<2;nr++) {
int dir=0;
struct plotxy q0,q1,q2,q3,q4,q5;
- startFill();
+
+ startFill(obj);
if(line_cap == LINE_CAP_BUTT) {
if(dir) {
+ /* FIXME: box should be smaller */
q0.x = 0; q0.y = 0;
- q1.x = sizex; q1.y = 0;
- q2.x = sizex; q2.y = sizey;
- q3.x = 0; q3.y = sizey;
+ q1.x = i->max_x; q1.y = 0;
+ q2.x = i->max_x; q2.y = i->max_y;
+ q3.x = 0; q3.y = i->max_y;
} else {
- q0.x = sizex; q0.y = sizey;
- q1.x = 0; q1.y = sizey;
+ /* FIXME: box should be smaller */
+ q0.x = i->max_x; q0.y = i->max_y;
+ q1.x = 0; q1.y = i->max_y;
q2.x = 0; q2.y = 0;
- q3.x = sizex; q3.y = 0;
+ q3.x = i->max_x; q3.y = 0;
}
q4.x = p0.x;
q4.y = p0.y;
- moveto(tag, q0);
- lineto(tag, q1);
- lineto(tag, q2);
- lineto(tag, q3);
- lineto(tag, q0);
+ moveto(obj, i->tag, q0);
+ lineto(obj, i->tag, q1);
+ lineto(obj, i->tag, q2);
+ lineto(obj, i->tag, q3);
+ lineto(obj, i->tag, q0);
transform(&q4,m);
- lineto(tag, q4);
+ lineto(obj, i->tag, q4);
}
- line(tag, p0, p1, m);
- line(tag, p1, p2, m);
- line(tag, p2, p3, m);
- line(tag, p3, p0, m);
+ line(obj, i->tag, p0, p1, m);
+ line(obj, i->tag, p1, p2, m);
+ line(obj, i->tag, p2, p3, m);
+ line(obj, i->tag, p3, p0, m);
if(line_cap == LINE_CAP_BUTT) {
- lineto(tag, q0);
- swf_ShapeSetEnd(tag);
- tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
- swf_ObjectPlaceClip(tag,shapeid,depth,NULL,NULL,NULL,depth+2-nr);
- depth++;
- shapeid = -1;
- startshape(output);
+ lineto(obj, i->tag, q0);
+ endshape(obj, i->depth+2-nr);
+ startshape(obj);
}
p0 = m0;
p1 = m1;
p3 = m3;
}
- stopFill();
+ stopFill(obj);
}
- drawShortPath(output,x,y,m,outline);
+ drawShortPath(obj,x,y,m,outline);
if(line_cap == LINE_CAP_BUTT) {
- endshape();
- startshape(output);
+ endshape(obj,0);
+ startshape(obj);
}
}
-void drawT1toRect(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width)
+void drawT1toRect(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
plotxy d1,d2,p1,p2,p3,p4;
d1.x = (outline->dest.x/(float)0xffff);
d1.y = (outline->dest.y/(float)0xffff);
- d2 = getPivot(outline, 0, line_width, 0, 0);
+ d2 = getPivot(obj, outline, 0, line_width, 0, 0);
assert(line_cap != LINE_CAP_ROUND);
if(line_cap == LINE_CAP_SQUARE) {
p4.x = x - d2.x;
p4.y = y - d2.y;
- line(tag, p1,p2, m);
- line(tag, p2,p3, m);
- line(tag, p3,p4, m);
- line(tag, p4,p1, m);
+ line(obj, i->tag, p1,p2, m);
+ line(obj, i->tag, p2,p3, m);
+ line(obj, i->tag, p3,p4, m);
+ line(obj, i->tag, p4,p1, m);
}
-void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width)
+void drawShortPathWithStraightEnds(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width)
{
- T1_OUTLINE*tmp=outline;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ SWF_OUTLINE*tmp=outline;
double xx=x,yy=y;
int stop=0;
- assert(shapeid>=0);
+ assert(i->shapeid>=0);
- startFill();
- drawT1toRect(output, x, y, m,outline, num, line_cap, line_join, line_width);
+ startFill(obj);
+ drawT1toRect(obj, x, y, m,outline, num, line_cap, line_join, line_width);
- while(tmp->link && tmp->link->type!=T1_PATHTYPE_MOVE) {
+ while(tmp->link && tmp->link->type!=SWF_PATHTYPE_MOVE) {
xx += (tmp->dest.x/(float)0xffff);
yy += (tmp->dest.y/(float)0xffff);
tmp = tmp->link;
}
- assert(tmp->type == T1_PATHTYPE_LINE);
- assert(outline->type == T1_PATHTYPE_LINE);
+ assert(tmp->type == SWF_PATHTYPE_LINE);
+ assert(outline->type == SWF_PATHTYPE_LINE);
if(tmp!=outline) {
need to draw) are very likely to overlap. To avoid that
they cancel each other out at the end points, start a new
shape for the second one */
- endshape();startshape(output);
- startFill();
+ endshape(obj,0);startshape(obj);
+ startFill(obj);
}
- drawT1toRect(output, xx, yy, m, tmp, num, line_cap, line_join, line_width);
+ drawT1toRect(obj, xx, yy, m, tmp, num, line_cap, line_join, line_width);
if(outline->link != tmp)
{
- stopFill();stop=1;
+ stopFill(obj);stop=1;
int save= tmp->type;
- tmp->type = T1_PATHTYPE_MOVE;
+ tmp->type = SWF_PATHTYPE_MOVE;
x += (outline->dest.x/(float)0xffff);
y += (outline->dest.y/(float)0xffff);
outline = outline->link;
- drawShortPath(output, x, y, m, outline);
+ drawShortPath(obj, x, y, m, outline);
tmp->type = save;
}
}
if(!stop)
- stopFill();
+ stopFill(obj);
}
-static int t1len(T1_OUTLINE*line)
+static int t1len(struct swfoutput*obj, SWF_OUTLINE*line)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
int num=0;
- while(line && line->type != T1_PATHTYPE_MOVE) {
+ while(line && line->type != SWF_PATHTYPE_MOVE) {
num++;
line = line->link;
}
return num;
}
-static float t1linelen(T1_OUTLINE*line)
+static float t1linelen(struct swfoutput*obj, SWF_OUTLINE*line)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
float x,y;
x = (line->dest.x/(float)0xffff);
y = (line->dest.y/(float)0xffff);
return sqrt(x*x+y*y);
}
-void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit)
+void drawpath2poly(struct swfoutput *obj, SWF_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit)
{
- if(tag->id != ST_DEFINEFONT &&
- tag->id != ST_DEFINESHAPE &&
- tag->id != ST_DEFINESHAPE2 &&
- tag->id != ST_DEFINESHAPE3) {
- msg("<error> internal error: drawpath needs a shape tag, not %d\n",tag->id);
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if( i->tag->id != ST_DEFINESHAPE &&
+ i->tag->id != ST_DEFINESHAPE2 &&
+ i->tag->id != ST_DEFINESHAPE3) {
+ msg("<error> internal error: drawpath needs a shape tag, not %d\n",i->tag->id);
exit(1);
}
- assert(shapeid>=0);
+ assert(i->shapeid>=0);
double x=0,y=0;
double lastx=0,lasty=0;
int valid = 0;
int lastwasline = 0;
- T1_OUTLINE*tmp = outline, *last = 0;
+ SWF_OUTLINE*tmp = outline, *last = 0;
tmp->last = 0;
while(1) {
+ double previousx = x, previousy = y;
if(tmp) {
x += (tmp->dest.x/(float)0xffff);
y += (tmp->dest.y/(float)0xffff);
}
- if(!tmp || tmp->type == T1_PATHTYPE_MOVE) {
+ if(!tmp || tmp->type == SWF_PATHTYPE_MOVE) {
if(valid && last) {
- if(last->type == T1_PATHTYPE_LINE && t1linelen(last)>line_width*2 &&
+ if(fabs(lastx-previousx)<0.001 && fabs(lasty-previousy)<0.001) {
+ /* endpoints match- the path is closed.
+ Don't bother to draw endings */
+ drawShortPath(obj, lastx, lasty, m, last);
+ }
+ if(last->type == SWF_PATHTYPE_LINE && t1linelen(obj,last)>line_width*2 &&
lastwasline && line_cap != LINE_CAP_ROUND)
- drawShortPathWithStraightEnds(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width);
+ drawShortPathWithStraightEnds(obj, lastx, lasty, m, last, valid, line_cap, line_join, line_width);
else
- drawShortPathWithEnds(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width);
+ drawShortPathWithEnds(obj, lastx, lasty, m, last, valid, line_cap, line_join, line_width);
}
if(!tmp)
break;
lasty = y;
} else {
if(!last)
- last = tmp;
+ last = tmp; //remember last stroke start (first segment after moveto)
valid++;
}
- if(tmp && tmp->type == T1_PATHTYPE_LINE && t1linelen(tmp)>line_width*2)
+ if(tmp && tmp->type == SWF_PATHTYPE_LINE && t1linelen(obj,tmp)>line_width*2)
lastwasline = 1;
else
lastwasline = 0;
}
}
-static inline int colorcompare(RGBA*a,RGBA*b)
+static inline int colorcompare(struct swfoutput*obj, RGBA*a,RGBA*b)
{
if(a->r!=b->r ||
return 1;
}
-static const int CHARDATAMAX = 1024;
-struct chardata {
- int charid;
- int fontid;
- int x;
- int y;
- int size;
- RGBA color;
-} chardata[CHARDATAMAX];
-int chardatapos = 0;
+static SRECT getcharacterbbox(struct swfoutput*obj, SWFFONT*font)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ SRECT r;
+ char debug = 0;
+ memset(&r, 0, sizeof(r));
+
+ int t;
+ if(debug) printf("\n");
+ for(t=0;t<i->chardatapos;t++)
+ {
+ if(i->chardata[t].fontid != font->id) {
+ msg("<error> Internal error: fontid %d != fontid %d", i->chardata[t].fontid, font->id);
+ exit(1);
+ }
+ SRECT b = font->layout->bounds[i->chardata[t].charid];
+ b.xmin *= i->chardata[t].size;
+ b.ymin *= i->chardata[t].size;
+ b.xmax *= i->chardata[t].size;
+ b.ymax *= i->chardata[t].size;
+ b.xmin /= 1024;
+ b.ymin /= 1024;
+ b.xmax /= 1024;
+ b.ymax /= 1024;
+ b.xmin += i->chardata[t].x;
+ b.ymin += i->chardata[t].y;
+ b.xmax += i->chardata[t].x;
+ b.ymax += i->chardata[t].y;
+
+ /* until we solve the INTERNAL_SCALING problem (see below)
+ make sure the bounding box is big enough */
+ b.xmin -= 20;
+ b.ymin -= 20;
+ b.xmax += 20;
+ b.ymax += 20;
+
+ if(debug) printf("(%f,%f,%f,%f) -> (%f,%f,%f,%f) [font %d/%d, char %d]\n",
+ font->layout->bounds[i->chardata[t].charid].xmin/20.0,
+ font->layout->bounds[i->chardata[t].charid].ymin/20.0,
+ font->layout->bounds[i->chardata[t].charid].xmax/20.0,
+ font->layout->bounds[i->chardata[t].charid].ymax/20.0,
+ b.xmin/20.0,
+ b.ymin/20.0,
+ b.xmax/20.0,
+ b.ymax/20.0,
+ i->chardata[t].fontid,
+ font->id,
+ i->chardata[t].charid
+ );
+ swf_ExpandRect2(&r, &b);
+ }
+ if(debug) printf("-----> (%f,%f,%f,%f)\n",
+ r.xmin/20.0,
+ r.ymin/20.0,
+ r.xmax/20.0,
+ r.ymax/20.0);
+ return r;
+}
-static void putcharacters(TAG*tag)
+static void putcharacters(struct swfoutput*obj, TAG*tag)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
int t;
SWFFONT font;
RGBA color;
- color.r = chardata[0].color.r^255;
+ color.r = i->chardata[0].color.r^255;
color.g = 0;
color.b = 0;
color.a = 0;
msg("<error> internal error: putcharacters needs an text tag, not %d\n",tag->id);
exit(1);
}
- if(!chardatapos) {
+ if(!i->chardatapos) {
msg("<warning> putcharacters called with zero characters");
}
swf_SetU8(tag, advancebits);
}
- for(t=0;t<=chardatapos;t++)
+ for(t=0;t<=i->chardatapos;t++)
{
- if(lastfontid != chardata[t].fontid ||
- lastx!=chardata[t].x ||
- lasty!=chardata[t].y ||
- !colorcompare(&color, &chardata[t].color) ||
+ if(lastfontid != i->chardata[t].fontid ||
+ lastx!=i->chardata[t].x ||
+ lasty!=i->chardata[t].y ||
+ !colorcompare(obj,&color, &i->chardata[t].color) ||
charstorepos==127 ||
- lastsize != chardata[t].size ||
- t == chardatapos)
+ lastsize != i->chardata[t].size ||
+ t == i->chardatapos)
{
if(charstorepos && pass==0)
{
}
charstorepos = 0;
- if(pass == 1 && t<chardatapos)
+ if(pass == 1 && t<i->chardatapos)
{
RGBA*newcolor=0;
SWFFONT*newfont=0;
int newx = 0;
int newy = 0;
- if(lastx != chardata[t].x ||
- lasty != chardata[t].y)
+ if(lastx != i->chardata[t].x ||
+ lasty != i->chardata[t].y)
{
- newx = chardata[t].x;
- newy = chardata[t].y;
+ newx = i->chardata[t].x;
+ newy = i->chardata[t].y;
if(newx == 0)
newx = SET_TO_ZERO;
if(newy == 0)
newy = SET_TO_ZERO;
}
- if(!colorcompare(&color, &chardata[t].color))
+ if(!colorcompare(obj,&color, &i->chardata[t].color))
{
- color = chardata[t].color;
+ color = i->chardata[t].color;
newcolor = &color;
}
- font.id = chardata[t].fontid;
- if(lastfontid != chardata[t].fontid || lastsize != chardata[t].size)
+ font.id = i->chardata[t].fontid;
+ if(lastfontid != i->chardata[t].fontid || lastsize != i->chardata[t].size)
newfont = &font;
tag->writeBit = 0; // Q&D
- swf_TextSetInfoRecord(tag, newfont, chardata[t].size, newcolor, newx,newy);
+ swf_TextSetInfoRecord(tag, newfont, i->chardata[t].size, newcolor, newx,newy);
}
- lastfontid = chardata[t].fontid;
- lastx = chardata[t].x;
- lasty = chardata[t].y;
- lastsize = chardata[t].size;
+ lastfontid = i->chardata[t].fontid;
+ lastx = i->chardata[t].x;
+ lasty = i->chardata[t].y;
+ lastsize = i->chardata[t].size;
}
- if(t==chardatapos)
+ if(t==i->chardatapos)
break;
int advance;
- int nextt = t==chardatapos-1?t:t+1;
- int rel = chardata[nextt].x-chardata[t].x;
+ int nextt = t==i->chardatapos-1?t:t+1;
+ int rel = i->chardata[nextt].x-i->chardata[t].x;
if(rel>=0 && (rel<(1<<(advancebits-1)) || pass==0)) {
advance = rel;
- lastx=chardata[nextt].x;
+ lastx=i->chardata[nextt].x;
}
else {
advance = 0;
- lastx=chardata[t].x;
+ lastx=i->chardata[t].x;
}
- charids[charstorepos] = chardata[t].charid;
+ charids[charstorepos] = i->chardata[t].charid;
charadvance[charstorepos] = advance;
charstorepos ++;
}
}
- chardatapos = 0;
+ i->chardatapos = 0;
}
static void putcharacter(struct swfoutput*obj, int fontid, int charid,
int x,int y, int size)
{
- if(chardatapos == CHARDATAMAX)
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->chardatapos == CHARDATAMAX)
{
- endtext();
+ msg("<warning> Character buffer too small. SWF will be slightly bigger");
+ endtext(obj);
starttext(obj);
}
- chardata[chardatapos].fontid = fontid;
- chardata[chardatapos].charid = charid;
- chardata[chardatapos].x = x;
- chardata[chardatapos].y = y;
- chardata[chardatapos].color = obj->fillrgb;
- chardata[chardatapos].size = size;
- chardatapos++;
+ i->chardata[i->chardatapos].fontid = fontid;
+ i->chardata[i->chardatapos].charid = charid;
+ i->chardata[i->chardatapos].x = x;
+ i->chardata[i->chardatapos].y = y;
+ i->chardata[i->chardatapos].color = obj->fillrgb;
+ i->chardata[i->chardatapos].size = size;
+ i->chardatapos++;
}
+/* Notice: we can only put chars in the range -1639,1638 (-32768/20,32768/20).
+ So if we set this value to high, the char coordinates will overflow.
+ If we set it to low, however, the char positions will be inaccurate */
+#define FONT_INTERNAL_SIZE 4
/* process a character. */
-static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, swfmatrix*m)
+static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m)
{
- int usefonts=1;
- if(m->m12!=0 || m->m21!=0)
- usefonts=0;
- if(m->m11 != m->m22)
- usefonts=0;
-
- if(!font) {
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(!swffont) {
msg("<warning> Font is NULL");
+ return 0;
}
- if(usefonts && ! drawonlyshapes)
- {
- int charid = font->getSWFCharID(character, charnr);
- if(charid<0) {
- msg("<warning> Didn't find character '%s' (%d) in current charset (%s)",
- FIXNULL(character),charnr, FIXNULL(font->getName()));
- return;
- }
- if(shapeid>=0)
- endshape();
- if(textid<0)
- starttext(obj);
- putcharacter(obj, font->swfid, charid,(int)(m->m13*20),(int)(m->m23*20),
- (int)(m->m11*20/2+0.5)); //where does the /2 come from?
+ int charid = getCharID(swffont, charnr, character, u);
+
+ if(charid<0) {
+ msg("<warning> Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)",
+ FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars);
+ return 0;
}
- else
+
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid<0)
+ starttext(obj);
+
+ float x = m->m13;
+ float y = m->m23;
+ float det = ((m->m11*m->m22)-(m->m21*m->m12));
+ if(fabs(det) < 0.0005) {
+ /* x direction equals y direction- the text is invisible */
+ return 1;
+ }
+ det = 20*FONT_INTERNAL_SIZE / det;
+
+ SPOINT p;
+ p.x = (SCOORD)(( x * m->m22 - y * m->m12)*det);
+ p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det);
+
+ putcharacter(obj, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE);
+ swf_FontUseGlyph(swffont, charid);
+ return 1;
+
+ /*else
{
- T1_OUTLINE*outline = font->getOutline(character, charnr);
+ SWF_OUTLINE*outline = font->getOutline(character, charnr);
char* charname = character;
if(!outline) {
m2.m22/=100;
if(textid>=0)
- endtext();
+ endtext(obj);
if(shapeid<0)
startshape(obj);
- startFill();
+ startFill(obj);
int lf = fill;
fill = 1;
drawpath(tag, outline, &m2, 0);
fill = lf;
- }
+ }*/
}
+static void endtext(swfoutput*obj)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->textid<0)
+ return;
+
+ i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT);
+ swf_SetU16(i->tag, i->textid);
+
+ SRECT r;
+ r = getcharacterbbox(obj, obj->swffont);
+
+ swf_SetRect(i->tag,&r);
+
+ MATRIX m;
+ swf_GetMatrix(0, &m); /* set unit matrix- the real matrix is in the placeobject */
+ swf_SetMatrix(i->tag,&m);
+
+ putcharacters(obj, i->tag);
+ swf_SetU8(i->tag,0);
+ i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+ //swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL);
+ MATRIX m2;
+ swf_MatrixJoin(&m2,&obj->fontmatrix, &i->page_matrix);
+
+ swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&m2,NULL,NULL);
+ i->textid = -1;
+}
+
+
/* draw a curved polygon. */
-void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline,
+void swfoutput_drawpath(swfoutput*obj, SWF_OUTLINE*outline,
struct swfmatrix*m)
{
- if(textid>=0)
- endtext();
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->textid>=0)
+ endtext(obj);
/* Multiple polygons in one shape don't overlap correctly,
so we better start a new shape here if the polygon is filled
*/
- if(shapeid>=0 && fill && !ignoredraworder) {
- endshape();
+ if(i->shapeid>=0 && i->fill && !config_ignoredraworder) {
+ endshape(obj,0);
}
- if(shapeid<0)
- startshape(output);
+ if(i->shapeid<0) {
+ startshape(obj);
+ }
- if(!fill)
- stopFill();
+ if(!i->fill)
+ stopFill(obj);
else
- startFill();
+ startFill(obj);
- drawpath(tag, outline,m, 0);
+ drawpath(obj, outline,m, 0);
}
-void swfoutput_drawpath2poly(struct swfoutput*output, T1_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit)
+void swfoutput_drawpath2poly(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit)
{
- if(textid>=0)
- endtext();
- if(shapeid>=0)
- endshape();
- assert(shapeid<0);
- startshape(output);
- stopFill();
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->textid>=0)
+ endtext(obj);
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ assert(i->shapeid<0);
+ startshape(obj);
+ stopFill(obj);
- drawpath2poly(output, outline, m, 0, line_join, line_cap, line_width, miter_limit);
+ drawpath2poly(obj, outline, m, 0, line_join, line_cap, line_width, miter_limit);
}
-/* SWFFont: copy all t1 font outlines to a local
- array. */
-SWFFont::SWFFont(char*name, int id, char*filename)
+int getCharID(SWFFONT *font, int charnr, char *charname, int u)
{
- if(!T1_GetFontName(id))
- T1_LoadFont(id);
-
- this->name = strdup(T1_GetFontFileName(id));
- this->fontid = strdup(name);
- this->t1id = id;
-
- char**charnamebase= T1_GetAllCharNames(id);
- char**a= charnamebase;
- int t, outlinepos=0;
- char*map[256];
-
- t=0;
- while(a[t])
- t++;
- this->charnum = t;
-
- if(!charnum)
- return;
- msg("<verbose> Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum);
-
- this->standardtablesize = 256;
- if(this->charnum < this->standardtablesize)
- this->standardtablesize = this->charnum;
- this->standardtable = (char**)malloc(standardtablesize*sizeof(char*));
-
- for(t = 0; t < this->standardtablesize; t++) {
- char*name = T1_GetCharName(id,t);
- char chh[2] = "";
- chh[0] = t;
- if(!name || !strstr(name, "notdef")) {
- if(t<standardEncodingSize) {
- name = standardEncodingNames[t];
- }
- if(!name) {
- name = ""; //TODO: store something like <%d>
+ int t;
+ if(charname && font->glyphnames) {
+ for(t=0;t<font->numchars;t++) {
+ if(font->glyphnames[t] && !strcmp(font->glyphnames[t],charname)) {
+ msg("<debug> Char [%d,>%s<,%d] maps to %d\n", charnr, charname, u, t);
+ return t;
}
}
- standardtable[t] = strdup(name);
- msg("<debug> Char %d is named %s\n", t, name);
- }
-
- outline = (T1_OUTLINE**)malloc(charnum*sizeof(T1_OUTLINE*));
- charname = (char**)malloc(charnum*sizeof(char*));
- width = (int*)malloc(charnum*sizeof(int));
- memset(width, 0, charnum*sizeof(int));
- memset(charname, 0, charnum*sizeof(char*));
- used = (char*)malloc(charnum*sizeof(char));
- char2swfcharid = (U16*)malloc(charnum*2);
- swfcharid2char = (U16*)malloc(charnum*2);
- swfcharpos = 0;
-
- memset(used,0,charnum*sizeof(char));
-
- this->swfid = ++currentswfid;
-
- t=0;
- while(*a)
- {
- map[t] = strdup(*a);
- a++;
- t++;
- if(t==256 || !*a) {
- int s;
- for(s=t;s<256;s++)
- map[s] = ".notdef";
-
- int ret = T1_ReencodeFont(id, map);
- if(ret) {
- T1_DeleteFont(id);
- T1_LoadFont(id);
- int ret = T1_ReencodeFont(id, map);
- if(ret)
- fprintf(stderr,"Can't reencode font: (%s) ret:%d\n",filename, ret);
- /* Deleting the font invalidates the charname array,
- so we have to ask for it again now.
- We continue at the position we were, hoping the font
- didn't shrink in the meantime or something.
- */
- a = T1_GetAllCharNames(id) + (a - charnamebase);
- }
-
- // parsecharacters
- for(s=0;s<t;s++)
- {
- char* name = T1_GetCharName(id, s);
- if(!name) name = "";
- this->outline[outlinepos] = T1_CopyOutline(T1_GetCharOutline(id, s, 100.0, 0));
- this->width[outlinepos] = T1_GetCharWidth(id, s);
- this->charname[outlinepos] = strdup(name);
- outlinepos++;
- }
-
- for(s=0;s<t;s++)
- free(map[s]);
- t=0;
- }
- }
-}
-
-/* free all tables, write out definefont tags */
-SWFFont::~SWFFont()
-{
- int t,usednum=0;
- int*ptr;
-
- if(storeallcharacters)
- {
- int t;
- for(t=0;t<this->charnum;t++)
- {
- if(this->charname[t])
- getSWFCharID(this->charname[t], -1);
+ /* if we didn't find the character, maybe
+ we can find the capitalized version */
+ for(t=0;t<font->numchars;t++) {
+ if(font->glyphnames[t] && !strcasecmp(font->glyphnames[t],charname)) {
+ msg("<debug> Char [%d,>>%s<<,%d] maps to %d\n", charnr, charname, u, t);
+ return t;
+ }
}
}
-
- ptr = (int*)malloc(swfcharpos*sizeof(int));
- for(t=0;t<charnum;t++)
- if(used[t]) usednum++;
-
- if(usednum && !drawonlyshapes)
- {
- msg("<verbose> Font %s has %d used characters",FIXNULL(fontid), usednum);
- TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT);
- swf_SetU16(ftag, this->swfid);
- int initpos = swf_GetTagLen(ftag);
- swfmatrix m;
- m.m11 = m.m22 = 1;
- m.m21 = m.m12 = 0;
- m.m13 = CHARMIDX;
- m.m23 = CHARMIDY;
-
- for(t=0;t<swfcharpos;t++)
- {
- ptr[t] = swf_GetTagLen(ftag);
- swf_SetU16(ftag, 0x1234);
- }
- for(t=0;t<swfcharpos;t++)
- {
- *(U16*)&ftag->data[ptr[t]] =
- SWAP16(swf_GetTagLen(ftag)-initpos);
-
- swflastx=0;
- swflasty=0;
- swf_SetU8(ftag,0x10); //1 fill bits, 0 linestyle bits
- SHAPE s;
- s.bits.fill = 1;
- s.bits.line = 0;
- swf_ShapeSetStyle(ftag,&s,0,1,0);
- fillstylechanged = 1;
- int lastfill = fill;
- fill = 1;
- storefont = 1;
- drawpath(ftag, outline[swfcharid2char[t]],&m, 0);
- storefont = 0;
- fill = lastfill;
- swf_ShapeSetEnd(ftag);
- }
- ftag = swf_InsertTag(ftag,ST_DEFINEFONTINFO);
- swf_SetU16(ftag, this->swfid);
- if(this->fontid) {
- swf_SetU8(ftag, strlen(this->fontid));
- swf_SetBlock(ftag, (U8*)this->fontid, strlen(this->fontid));
- } else {
- swf_SetU8(ftag, 0);
- }
- swf_SetU8(ftag, 0); //flags
- for(t=0;t<swfcharpos;t++)
- {
- int s;
- char * name = this->charname[this->swfcharid2char[t]];
- for(s=0;s<256;s++) {
- if(standardEncodingNames[s] &&
- !strcmp(name,standardEncodingNames[s]))
- break;
- }
- swf_SetU8(ftag, (U8)s);
+ if(u>0 && font->encoding != 255) {
+ /* try to use the unicode id */
+ if(u>=0 && u<font->maxascii && font->ascii2glyph[u]>=0) {
+ msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->ascii2glyph[u]);
+ return font->ascii2glyph[u];
}
}
- free(ptr);
- free(outline);
- for(t=0;t<charnum;t++)
- free(charname[t]);
- for(t=0;t<standardtablesize;t++)
- if(standardtable[t]) {
- free(standardtable[t]);
+ if(font->encoding != FONT_ENCODING_UNICODE) {
+ /* the following only works if the font encoding
+ is US-ASCII based. It's needed for fonts which return broken unicode
+ indices */
+ if(charnr>=0 && charnr<font->maxascii && font->ascii2glyph[charnr]>=0) {
+ msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, font->ascii2glyph[charnr]);
+ return font->ascii2glyph[charnr];
}
- free(standardtable);
- free(charname);
- free(width);
- free(used);
- free(swfcharid2char);
- free(char2swfcharid);
-}
-
-T1_OUTLINE*SWFFont::getOutline(char*name, int charnr)
-{
- int t;
- for(t=0;t<this->charnum;t++) {
- if(!strcmp(this->charname[t],name)) {
- 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) {
- T1_OUTLINE*ret = getOutline(this->standardtable[charnr], -1);
- if(ret) return ret;
- }
-
- return 0;
-}
-
-int SWFFont::getSWFCharID(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++;
- used[t] = 1;
- }
- return char2swfcharid[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)) {
- if(!used[t])
- {
- swfcharid2char[swfcharpos] = t;
- char2swfcharid[t] = swfcharpos++;
- used[t] = 1;
- }
- 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) {
- int ret = getSWFCharID(this->standardtable[charnr], -1);
- if(ret) return ret;
+ if(charnr>=0 && charnr<font->numchars) {
+ msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
+ return charnr;
}
+
return -1;
}
-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;
-}
-
-struct fontlist_t
-{
- SWFFont * font;
- fontlist_t*next;
-} *fontlist = 0;
/* set's the t1 font index of the font to use for swfoutput_drawchar(). */
-void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filename)
+void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
fontlist_t*last=0,*iterator;
- if(obj->font && !strcmp(obj->font->fontid,fontid))
+ if(!fontid) {
+ msg("<error> No fontid");
+ return;
+ }
+
+ if(obj->swffont && obj->swffont->name && !strcmp((char*)obj->swffont->name,fontid))
return;
- iterator = fontlist;
+ /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope
+ with multiple fonts */
+ endtext(obj);
+
+ iterator = i->fontlist;
while(iterator) {
- if(!strcmp(iterator->font->fontid,fontid))
- break;
+ if(!strcmp((char*)iterator->swffont->name,fontid)) {
+ obj->swffont = iterator->swffont;
+ return;
+ }
last = iterator;
iterator = iterator->next;
}
- if(iterator)
- {
- obj->font = iterator->font;
- return ;
+
+ if(!filename) {
+ msg("<error> No filename given for font- internal error?");
+ return;
}
- if(t1id<0) {
- msg("<error> internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid));
+ swf_SetLoadFontParameters(64,/*skip unused*/0,/*full unicode*/1);
+ SWFFONT*swffont = swf_LoadFont(filename);
+
+ if(swffont == 0) {
+ msg("<warning> Couldn't load font %s (%s)", fontid, filename);
+ swffont = swf_LoadFont(0);
+ }
+
+ if(swffont->glyph2ascii) {
+ int t;
+ int bad = 0;
+ /* check whether the Unicode indices look o.k.
+ If they don't, disable the unicode lookup by setting
+ the encoding to 255 */
+ for(t=0;t<swffont->numchars;t++) {
+ int c = swffont->glyph2ascii[t];
+ if(c && c < 32 && swffont->glyph[t].shape->bitlen > 16) {
+ // the character maps into the unicode control character range
+ // between 0001-001f. Yet it is not empty. Treat the one
+ // mapping as broken, and look how many of those we find.
+ bad ++;
+ }
+ }
+ if(bad>5) {
+ msg("<warning> Font %s has bad unicode mapping", swffont->name);
+ swffont->encoding = 255;
+ }
}
+
+ swf_FontSetID(swffont, ++i->currentswfid);
- SWFFont*font = new SWFFont(fontid, t1id, filename);
+ if(getScreenLogLevel() >= LOGLEVEL_DEBUG) {
+ // print font information
+ msg("<debug> Font %s (%s)",swffont->name, filename);
+ msg("<debug> | ID: %d", swffont->id);
+ msg("<debug> | Version: %d", swffont->version);
+ msg("<debug> | Name: %s", fontid);
+ msg("<debug> | Numchars: %d", swffont->numchars);
+ msg("<debug> | Maxascii: %d", swffont->maxascii);
+ msg("<debug> | Style: %d", swffont->style);
+ msg("<debug> | Encoding: %d", swffont->encoding);
+ for(int iii=0; iii<swffont->numchars;iii++) {
+ msg("<debug> | Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames?swffont->glyphnames[iii]:"<nonames>", swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen,
+ swffont->layout->bounds[iii].xmin/20.0,
+ swffont->layout->bounds[iii].ymin/20.0,
+ swffont->layout->bounds[iii].xmax/20.0,
+ swffont->layout->bounds[iii].ymax/20.0
+ );
+ int t;
+ for(t=0;t<swffont->maxascii;t++) {
+ if(swffont->ascii2glyph[t] == iii)
+ msg("<debug> | - maps to %d",t);
+ }
+ }
+ }
+
+ /* set the font name to the ID we use here */
+ if(swffont->name) free(swffont->name);
+ swffont->name = (U8*)strdup(fontid);
+
iterator = new fontlist_t;
- iterator->font = font;
+ iterator->swffont = swffont;
iterator->next = 0;
if(last)
last->next = iterator;
else
- fontlist = iterator;
- obj->font = font;
+ i->fontlist = iterator;
+
+ obj->swffont = swffont;
}
int swfoutput_queryfont(struct swfoutput*obj, char*fontid)
{
- fontlist_t *iterator = fontlist;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ fontlist_t *iterator = i->fontlist;
while(iterator) {
- if(!strcmp(iterator->font->fontid,fontid))
+ if(!strcmp((char*)iterator->swffont->name,fontid))
return 1;
iterator = iterator->next;
}
void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12,
double m21,double m22)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
if(obj->fontm11 == m11 &&
obj->fontm12 == m12 &&
obj->fontm21 == m21 &&
obj->fontm22 == m22)
return;
-// if(textid>=0)
-// endtext();
+ if(i->textid>=0)
+ endtext(obj);
obj->fontm11 = m11;
obj->fontm12 = m12;
obj->fontm21 = m21;
obj->fontm22 = m22;
+
+ MATRIX m;
+ m.sx = (U32)(((obj->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((obj->fontm12)*65536)/FONT_INTERNAL_SIZE);
+ m.r0 = (U32)(((obj->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((obj->fontm22)*65536)/FONT_INTERNAL_SIZE);
+ m.tx = 0;
+ m.ty = 0;
+ obj->fontmatrix = m;
}
/* draws a character at x,y. */
-void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr)
+int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr, int u)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
swfmatrix m;
m.m11 = obj->fontm11;
m.m12 = obj->fontm12;
m.m22 = obj->fontm22;
m.m13 = x;
m.m23 = y;
- drawchar(obj, obj->font, character, charnr, &m);
+ return drawchar(obj, obj->swffont, character, charnr, u, &m);
}
-/* initialize the swf writer */
-void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _sizey)
+static void endpage(struct swfoutput*obj)
{
- GLYPH *glyph;
- RGBA rgb;
- SRECT r;
- memset(obj, 0, sizeof(struct swfoutput));
- filename = _filename;
- sizex = _sizex;
- sizey = _sizey;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
+ while(i->clippos)
+ swfoutput_endclip(obj);
+ i->pagefinished = 1;
+}
- msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
+void swfoutput_pagefeed(struct swfoutput*obj)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+
+ if(!i->pagefinished)
+ endpage(obj);
- obj->font = 0;
-
- memset(&swf,0x00,sizeof(SWF));
+ if(config_insertstoptag) {
+ ActionTAG*atag=0;
+ atag = action_Stop(atag);
+ atag = action_End(atag);
+ i->tag = swf_InsertTag(i->tag,ST_DOACTION);
+ swf_ActionSet(i->tag,atag);
+ }
+ i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME);
+ i->frameno ++;
+
+ for(i->depth--;i->depth>=i->startdepth;i->depth--) {
+ i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2);
+ swf_SetU16(i->tag,i->depth);
+ }
+ i->depth = i->startdepth;
+}
- swf.fileVersion = flashversion;
- swf.frameRate = 0x0040; // 1 frame per 4 seconds
- swf.movieSize.xmax = 20*sizex;
- swf.movieSize.ymax = 20*sizey;
-
- swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
- tag = swf.firstTag;
- rgb.r = 0xff;
- rgb.g = 0xff;
- rgb.b = 0xff;
- swf_SetRGB(tag,&rgb);
- if(flag_protected) // good practice! /r
- tag = swf_InsertTag(tag, ST_PROTECT);
- depth = 1;
- startdepth = depth;
+static void setBackground(struct swfoutput*obj, int x1, int y1, int x2, int y2)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ RGBA rgb;
+ rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
+ SRECT r;
+ SHAPE* s;
+ int ls1=0,fs1=0;
+ int shapeid = ++i->currentswfid;
+ r.xmin = x1;
+ r.ymin = y1;
+ r.xmax = x2;
+ r.ymax = y2;
+ i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE);
+ swf_ShapeNew(&s);
+ fs1 = swf_ShapeAddSolidFillStyle(s, &rgb);
+ swf_SetU16(i->tag,shapeid);
+ swf_SetRect(i->tag,&r);
+ swf_SetShapeHeader(i->tag,s);
+ swf_ShapeSetAll(i->tag,s,x1,y1,ls1,fs1,0);
+ swf_ShapeSetLine(i->tag,s,(x2-x1),0);
+ swf_ShapeSetLine(i->tag,s,0,(y2-y1));
+ swf_ShapeSetLine(i->tag,s,(x1-x2),0);
+ swf_ShapeSetLine(i->tag,s,0,(y1-y2));
+ swf_ShapeSetEnd(i->tag);
+ swf_ShapeFree(s);
+ i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2);
+ swf_ObjectPlace(i->tag,shapeid,i->depth++,0,0,0);
+ i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2);
+ swf_ObjectPlaceClip(i->tag,shapeid,i->depth++,0,0,0,65535);
+ i->cliptag = i->tag;
}
-void swfoutput_setprotected() //write PROTECT tag
+void swfoutput_newpage(struct swfoutput*obj, int pageNum, int movex, int movey, int x1, int y1, int x2, int y2)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(!i->firstpage && !i->pagefinished)
+ endpage(obj);
+
+ swf_GetMatrix(0, &i->page_matrix);
+ i->page_matrix.tx = movex*20;
+ i->page_matrix.ty = movey*20;
+
+ if(i->cliptag && i->frameno == i->lastframeno) {
+ SWFPLACEOBJECT obj;
+ swf_GetPlaceObject(i->cliptag, &obj);
+ obj.clipdepth = i->depth++;
+ swf_ResetTag(i->cliptag, i->cliptag->id);
+ swf_SetPlaceObject(i->cliptag, &obj);
+ swf_PlaceObjectFree(&obj);
+ }
+
+ i->min_x = x1;
+ i->min_y = y1;
+ i->max_x = x2;
+ i->max_y = y2;
+
+ msg("<notice> processing page %d (%dx%d:%d:%d)", pageNum,x2-x1,y2-y1, x1, y1);
+
+ x1*=20;y1*=20;x2*=20;y2*=20;
+
+ /* set clipping/background rectangle */
+ /* TODO: this should all be done in SWFOutputDev */
+ setBackground(obj, x1, y1, x2, y2);
+
+ /* increase SWF's bounding box */
+ SRECT r;
+ r.xmin = x1;
+ r.ymin = y1;
+ r.xmax = x2;
+ r.ymax = y2;
+ swf_ExpandRect2(&i->swf.movieSize, &r);
+
+ i->lastframeno = i->frameno;
+ i->firstpage = 0;
+ i->pagefinished = 0;
+}
+
+/* initialize the swf writer */
+void swfoutput_init(struct swfoutput* obj)
{
- flag_protected = 1;
+ memset(obj, 0, sizeof(struct swfoutput));
+ obj->internal = init_internal_struct();
+
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+
+ SRECT r;
+ RGBA rgb;
+
+ msg("<verbose> initializing swf output for size %d*%d\n", i->max_x,i->max_y);
+
+ obj->swffont = 0;
+ obj->drawmode = -1;
+
+ memset(&i->swf,0x00,sizeof(SWF));
+
+ i->swf.fileVersion = config_flashversion;
+ i->swf.frameRate = 0x0040; // 1 frame per 4 seconds
+ i->swf.movieSize.xmin = 0;
+ i->swf.movieSize.ymin = 0;
+ i->swf.movieSize.xmax = 0;
+ i->swf.movieSize.ymax = 0;
+
+ i->swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
+ i->tag = i->swf.firstTag;
+ rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
+ swf_SetRGB(i->tag,&rgb);
+
+ i->startdepth = i->depth = 3; /* leave room for clip and background rectangle */
+
+ if(config_protect)
+ i->tag = swf_InsertTag(i->tag, ST_PROTECT);
}
static void startshape(struct swfoutput*obj)
{
- RGBA rgb;
- SRECT r;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ RGBA rgb;
+ SRECT r;
- if(textid>=0)
- endtext();
+ if(i->textid>=0)
+ endtext(obj);
- tag = swf_InsertTag(tag,ST_DEFINESHAPE);
+ i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
- swf_ShapeNew(&shape);
- linestyleid = swf_ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb);
- rgb.r = obj->fillrgb.r;
- rgb.g = obj->fillrgb.g;
- rgb.b = obj->fillrgb.b;
- fillstyleid = swf_ShapeAddSolidFillStyle(shape,&obj->fillrgb);
+ swf_ShapeNew(&i->shape);
+ i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&obj->strokergb);
+ rgb.r = obj->fillrgb.r;
+ rgb.g = obj->fillrgb.g;
+ rgb.b = obj->fillrgb.b;
+ i->fillstyleid = swf_ShapeAddSolidFillStyle(i->shape,&obj->fillrgb);
- shapeid = ++currentswfid;
- swf_SetU16(tag,shapeid); // ID
+ i->shapeid = ++i->currentswfid;
+ swf_SetU16(i->tag,i->shapeid); // ID
- r.xmin = 0;
- r.ymin = 0;
- r.xmax = 20*sizex;
- r.ymax = 20*sizey;
-
- swf_SetRect(tag,&r);
+ i->bboxrectpos = i->tag->len;
+ r.xmin = 0;
+ r.ymin = 0;
+ r.xmax = 20*i->max_x;
+ r.ymax = 20*i->max_y;
+ swf_SetRect(i->tag,&r);
+
+ memset(&i->bboxrect, 0, sizeof(i->bboxrect));
- swf_SetShapeStyles(tag,shape);
- swf_ShapeCountBits(shape,NULL,NULL);
- swf_SetShapeBits(tag,shape);
+ swf_SetShapeStyles(i->tag,i->shape);
+ swf_ShapeCountBits(i->shape,NULL,NULL);
+ swf_SetShapeBits(i->tag,i->shape);
- swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,linestyleid,0,0);
- swflastx=swflasty=0;
- lastwasfill = 0;
+ /* 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;
+ i->shapeisempty = 1;
}
static void starttext(struct swfoutput*obj)
{
- SRECT r;
- MATRIX m;
- if(shapeid>=0)
- endshape();
- tag = swf_InsertTag(tag,ST_DEFINETEXT);
- textid = ++currentswfid;
- swf_SetU16(tag, textid);
-
- r.xmin = 0;
- r.ymin = 0;
- r.xmax = 20*sizex;
- r.ymax = 20*sizey;
-
- swf_SetRect(tag,&r);
-
- m.sx = 65536;
- m.sy = 65536;
- m.r0 = 0;
- m.r1 = 0;
- m.tx = 0;
- m.ty = 0;
-
- swf_SetMatrix(tag,&m);
- swflastx=swflasty=0;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->shapeid>=0)
+ endshape(obj,0);
+
+ i->textid = ++i->currentswfid;
+
+ i->swflastx=i->swflasty=0;
}
+
-static void endshape()
+/* TODO: move to ../lib/rfxswf */
+void changeRect(struct swfoutput*obj, TAG*tag, int pos, SRECT*newrect)
{
- if(shapeid<0)
- return;
- swf_ShapeSetEnd(tag);
- tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL);
- shapeid = -1;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ /* determine length of old rect */
+ tag->pos = pos;
+ tag->readBit = 0;
+ SRECT old;
+ swf_GetRect(tag, &old);
+ swf_ResetReadBits(tag);
+ int pos_end = tag->pos;
+
+ int len = tag->len - pos_end;
+ U8*data = (U8*)malloc(len);
+ memcpy(data, &tag->data[pos_end], len);
+ tag->writeBit = 0;
+ tag->len = pos;
+ swf_SetRect(tag, newrect);
+ swf_SetBlock(tag, data, len);
+ free(data);
+ tag->pos = tag->readBit = 0;
}
-static void endtext()
+void cancelshape(swfoutput*obj)
{
- if(textid<0)
- return;
- putcharacters(tag);
- swf_SetU8(tag,0);
- tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(tag,textid,/*depth*/depth++,NULL,NULL,NULL);
- textid = -1;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ /* delete old shape tag */
+ TAG*todel = i->tag;
+ i->tag = i->tag->prev;
+ swf_DeleteTag(todel);
+ if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;}
+ i->shapeid = -1;
+ i->bboxrectpos = -1;
}
-static void endpage(struct swfoutput*obj)
+void fixAreas(swfoutput*obj)
{
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
- while(clippos)
- swfoutput_endclip(obj);
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(!i->shapeisempty && i->fill &&
+ (i->bboxrect.xmin == i->bboxrect.xmax ||
+ i->bboxrect.ymin == i->bboxrect.ymax) &&
+ config_minlinewidth >= 0.001
+ ) {
+ msg("<debug> Shape has size 0: width=%.2f height=%.2f",
+ (i->bboxrect.xmax-i->bboxrect.xmin)/20.0,
+ (i->bboxrect.ymax-i->bboxrect.ymin)/20.0
+ );
+
+ SRECT r = i->bboxrect;
+
+ if(r.xmin == r.xmax && r.ymin == r.ymax) {
+ /* this thing comes down to a single dot- nothing to fix here */
+ return;
+ }
- if(insertstoptag) {
- ActionTAG*atag=0;
- atag = action_Stop(atag);
- atag = action_End(atag);
- tag = swf_InsertTag(tag,ST_DOACTION);
- swf_ActionSet(tag,atag);
+ cancelshape(obj);
+
+ RGBA save_col = obj->strokergb;
+ int save_width = i->linewidth;
+
+ obj->strokergb = obj->fillrgb;
+ i->linewidth = (int)(config_minlinewidth*20);
+ if(i->linewidth==0) i->linewidth = 1;
+
+ startshape(obj);
+
+ moveto(obj, i->tag, r.xmin/20.0,r.ymin/20.0);
+ lineto(obj, i->tag, r.xmax/20.0,r.ymax/20.0);
+
+ obj->strokergb = save_col;
+ i->linewidth = save_width;
}
- tag = swf_InsertTag(tag,ST_SHOWFRAME);
+
}
-void swfoutput_newpage(struct swfoutput*obj)
+static void endshape_noput(swfoutput*obj)
{
- endpage(obj);
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->shapeid<0)
+ return;
+ //changeRect(obj, i->tag, i->bboxrectpos, &i->bboxrect);
+ i->shapeid = -1;
+ if(i->shape) {
+ swf_ShapeFree(i->shape);
+ i->shape=0;
+ }
+}
+
+static void endshape(swfoutput*obj, int clipdepth)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->shapeid<0)
+ return;
- for(depth--;depth>=startdepth;depth--) {
- tag = swf_InsertTag(tag,ST_REMOVEOBJECT2);
- swf_SetU16(tag,depth);
+ if(!clipdepth)
+ fixAreas(obj);
+
+ if(i->shapeisempty ||
+ /*bbox empty?*/
+ (i->bboxrect.xmin == i->bboxrect.xmax &&
+ i->bboxrect.ymin == i->bboxrect.ymax))
+ {
+ // delete the shape again, we didn't do anything
+ cancelshape(obj);
+ return;
}
+
+ swf_ShapeSetEnd(i->tag);
+
+ changeRect(obj, i->tag, i->bboxrectpos, &i->bboxrect);
+
+ i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
- depth = 1;
- startdepth = depth;
+ if(clipdepth)
+ swf_ObjectPlaceClip(i->tag,i->shapeid,i->depth++,&i->page_matrix,NULL,NULL,clipdepth);
+ else
+ swf_ObjectPlace(i->tag,i->shapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL);
+
+ swf_ShapeFree(i->shape);
+ i->shape = 0;
+ i->shapeid = -1;
+ i->bboxrectpos = -1;
}
-/* "destroy" like in (oo-terminology) "destructor". Perform cleaning
- up, complete the swf, and write it out. */
-void swfoutput_destroy(struct swfoutput* obj)
+void swfoutput_finalize(struct swfoutput*obj)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+
+ if(i->tag && i->tag->id == ST_END)
+ return; //already done
+
+ if(i->frameno == i->lastframeno) // fix: add missing pagefeed
+ swfoutput_pagefeed(obj);
+
endpage(obj);
- fontlist_t *tmp,*iterator = fontlist;
+ fontlist_t *tmp,*iterator = i->fontlist;
while(iterator) {
- delete iterator->font;
- iterator->font = 0;
- tmp = iterator;
+ TAG*mtag = i->swf.firstTag;
+ if(iterator->swffont) {
+ mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
+ /*if(!storeallcharacters)
+ swf_FontReduce(iterator->swffont);*/
+ swf_FontSetDefine2(mtag, iterator->swffont);
+ }
+
iterator = iterator->next;
- delete tmp;
}
+ i->tag = swf_InsertTag(i->tag,ST_END);
+ TAG* tag = i->tag->prev;
+
+ /* remove the removeobject2 tags between the last ST_SHOWFRAME
+ and the ST_END- they confuse the flash player */
+ while(tag->id == ST_REMOVEOBJECT2) {
+ TAG* prev = tag->prev;
+ swf_DeleteTag(tag);
+ tag = prev;
+ }
+}
- T1_CloseLib();
- if(!filename)
- return;
+SWF* swfoutput_get(struct swfoutput*obj)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+
+ swfoutput_finalize(obj);
+
+ return swf_CopySWF(&i->swf);
+}
+
+void swfoutput_getdimensions(struct swfoutput*obj, int*x1, int*y1, int*x2, int*y2)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(x1) *x1 = i->swf.movieSize.xmin/20;
+ if(y1) *y1 = i->swf.movieSize.ymin/20;
+ if(x2) *x2 = i->swf.movieSize.xmax/20;
+ if(y2) *y2 = i->swf.movieSize.ymax/20;
+}
+
+int swfoutput_save(struct swfoutput* obj, char*filename)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ swfoutput_finalize(obj);
+
+ int fi;
if(filename)
fi = open(filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777);
else
if(fi<=0) {
msg("<fatal> Could not create \"%s\". ", FIXNULL(filename));
- exit(1);
+ return 0;
}
-
- tag = swf_InsertTag(tag,ST_END);
-
- if(enablezlib) {
- if FAILED(swf_WriteSWC(fi,&swf))
+
+ if(config_enablezlib || config_flashversion>=6) {
+ if FAILED(swf_WriteSWC(fi,&i->swf))
msg("<error> WriteSWC() failed.\n");
} else {
- if FAILED(swf_WriteSWF(fi,&swf))
+ if FAILED(swf_WriteSWF(fi,&i->swf))
msg("<error> WriteSWF() failed.\n");
}
if(filename)
close(fi);
msg("<notice> SWF written\n");
+ return 1;
+}
+
+/* Perform cleaning up, complete the swf, and write it out. */
+void swfoutput_destroy(struct swfoutput* obj)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(!i) {
+ /* not initialized yet- nothing to destroy */
+ return;
+ }
+
+ fontlist_t *tmp,*iterator = i->fontlist;
+ while(iterator) {
+ if(iterator->swffont) {
+ swf_FontFree(iterator->swffont);iterator->swffont=0;
+ }
+ tmp = iterator;
+ iterator = iterator->next;
+ delete tmp;
+ }
+ swf_FreeTags(&i->swf);
+
+ free(i);i=0;
+ memset(obj, 0, sizeof(swfoutput));
}
void swfoutput_setdrawmode(swfoutput* obj, int mode)
{
- drawmode = mode;
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ obj->drawmode = mode;
if(mode == DRAWMODE_FILL)
- fill = 1;
+ i->fill = 1;
else if(mode == DRAWMODE_EOFILL)
- fill = 1;
+ i->fill = 1;
else if(mode == DRAWMODE_STROKE)
- fill = 0;
+ i->fill = 0;
else if(mode == DRAWMODE_CLIP)
- fill = 1;
+ i->fill = 1;
else if(mode == DRAWMODE_EOCLIP)
- fill = 1;
+ i->fill = 1;
}
-void swfoutput_setfillcolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a)
+void swfoutput_setfillcolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
if(obj->fillrgb.r == r &&
obj->fillrgb.g == g &&
obj->fillrgb.b == b &&
obj->fillrgb.a == a) return;
- if(shapeid>=0)
- endshape();
+ if(i->shapeid>=0)
+ endshape(obj,0);
obj->fillrgb.r = r;
obj->fillrgb.g = g;
obj->fillrgb.a = a;
}
-void swfoutput_setstrokecolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a)
+void swfoutput_setstrokecolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
if(obj->strokergb.r == r &&
obj->strokergb.g == g &&
obj->strokergb.b == b &&
obj->strokergb.a == a) return;
- if(shapeid>=0)
- endshape();
+ if(i->shapeid>=0)
+ endshape(obj,0);
obj->strokergb.r = r;
obj->strokergb.g = g;
obj->strokergb.b = b;
obj->strokergb.a = a;
}
-void swfoutput_setlinewidth(struct swfoutput*obj, double linewidth)
+void swfoutput_setlinewidth(struct swfoutput*obj, double _linewidth)
{
- if(obj->linewidth == (u16)(linewidth*20))
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->linewidth == (U16)(_linewidth*20))
return;
- if(shapeid>=0)
- endshape();
- obj->linewidth = (u16)(linewidth*20);
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ i->linewidth = (U16)(_linewidth*20);
}
-void swfoutput_startclip(swfoutput*obj, T1_OUTLINE*outline, struct swfmatrix*m)
+void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m)
{
- if(textid>=0)
- endtext();
- if(shapeid>=0)
- endshape();
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->textid>=0)
+ endtext(obj);
+ if(i->shapeid>=0)
+ endshape(obj,0);
- if(clippos >= 127)
+ if(i->clippos >= 127)
{
msg("<warning> Too many clip levels.");
- clippos --;
+ i->clippos --;
}
startshape(obj);
- int olddrawmode = drawmode;
+ int olddrawmode = obj->drawmode;
swfoutput_setdrawmode(obj, DRAWMODE_CLIP);
swfoutput_drawpath(obj, outline, m);
- swf_ShapeSetEnd(tag);
+ swf_ShapeSetEnd(i->tag);
swfoutput_setdrawmode(obj, olddrawmode);
- tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
- cliptags[clippos] = tag;
- clipshapes[clippos] = shapeid;
- clipdepths[clippos] = depth++;
- clippos++;
- shapeid = -1;
+ i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+ i->cliptags[i->clippos] = i->tag;
+ i->clipshapes[i->clippos] = i->shapeid;
+ i->clipdepths[i->clippos] = i->depth++;
+ i->clippos++;
+
+ endshape_noput(obj);
}
void swfoutput_endclip(swfoutput*obj)
{
- if(textid>=0)
- endtext();
- if(shapeid>=0)
- endshape();
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->textid>=0)
+ endtext(obj);
+ if(i->shapeid>=0)
+ endshape(obj,0);
- if(!clippos) {
+ if(!i->clippos) {
msg("<error> Invalid end of clipping region");
return;
}
- clippos--;
- swf_ObjectPlaceClip(cliptags[clippos],clipshapes[clippos],clipdepths[clippos],NULL,NULL,NULL,depth++);
+ i->clippos--;
+ swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,i->depth++);
}
static void drawlink(struct swfoutput*obj, ActionTAG*,ActionTAG*, swfcoord*points, char mouseover);
void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
ActionTAG* actions;
if(!strncmp("http://pdf2swf:", url, 15)) {
char*tmp = strdup(url);
return;
}
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
- if(opennewwindow)
+ if(config_opennewwindow)
actions = action_GetUrl(0, url, "_parent");
else
actions = action_GetUrl(0, url, "_this");
}
void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
ActionTAG* actions;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
actions = action_GotoFrame(0, page);
actions = action_End(actions);
*/
void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
ActionTAG *actions1,*actions2;
char*tmp = strdup(name);
char mouseover = 1;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
if(!strncmp(tmp, "call:", 5))
{
static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions2, swfcoord*points, char mouseover)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
RGBA rgb;
SRECT r;
int lsid=0;
double posx = 0;
double posy = 0;
int t;
- int buttonid = ++currentswfid;
+ int buttonid = ++i->currentswfid;
for(t=1;t<4;t++)
{
if(points[t].x>xmax) xmax=points[t].x;
xmax -= posx; ymax -= posy;
/* shape */
- myshapeid = ++currentswfid;
- tag = swf_InsertTag(tag,ST_DEFINESHAPE3);
- swf_ShapeNew(&shape);
+ myshapeid = ++i->currentswfid;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
+ swf_ShapeNew(&i->shape);
rgb.r = rgb.b = rgb.a = rgb.g = 0;
- fsid = swf_ShapeAddSolidFillStyle(shape,&rgb);
- swf_SetU16(tag, myshapeid);
+ fsid = swf_ShapeAddSolidFillStyle(i->shape,&rgb);
+ swf_SetU16(i->tag, myshapeid);
r.xmin = (int)(xmin*20);
r.ymin = (int)(ymin*20);
r.xmax = (int)(xmax*20);
r.ymax = (int)(ymax*20);
- swf_SetRect(tag,&r);
- swf_SetShapeStyles(tag,shape);
- swf_ShapeCountBits(shape,NULL,NULL);
- swf_SetShapeBits(tag,shape);
- swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,0,fsid,0);
- swflastx = swflasty = 0;
- moveto(tag, p1);
- lineto(tag, p2);
- lineto(tag, p3);
- lineto(tag, p4);
- lineto(tag, p1);
- swf_ShapeSetEnd(tag);
+ swf_SetRect(i->tag,&r);
+ swf_SetShapeStyles(i->tag,i->shape);
+ swf_ShapeCountBits(i->shape,NULL,NULL);
+ swf_SetShapeBits(i->tag,i->shape);
+ swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0);
+ i->swflastx = i->swflasty = 0;
+ moveto(obj, i->tag, p1);
+ lineto(obj, i->tag, p2);
+ lineto(obj, i->tag, p3);
+ lineto(obj, i->tag, p4);
+ lineto(obj, i->tag, p1);
+ swf_ShapeSetEnd(i->tag);
/* shape2 */
- myshapeid2 = ++currentswfid;
- tag = swf_InsertTag(tag,ST_DEFINESHAPE3);
- swf_ShapeNew(&shape);
+ myshapeid2 = ++i->currentswfid;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
+ swf_ShapeNew(&i->shape);
rgb.r = rgb.b = rgb.a = rgb.g = 255;
rgb.a = 40;
- fsid = swf_ShapeAddSolidFillStyle(shape,&rgb);
- swf_SetU16(tag, myshapeid2);
+ fsid = swf_ShapeAddSolidFillStyle(i->shape,&rgb);
+ swf_SetU16(i->tag, myshapeid2);
r.xmin = (int)(xmin*20);
r.ymin = (int)(ymin*20);
r.xmax = (int)(xmax*20);
r.ymax = (int)(ymax*20);
- swf_SetRect(tag,&r);
- swf_SetShapeStyles(tag,shape);
- swf_ShapeCountBits(shape,NULL,NULL);
- swf_SetShapeBits(tag,shape);
- swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,0,fsid,0);
- swflastx = swflasty = 0;
- moveto(tag, p1);
- lineto(tag, p2);
- lineto(tag, p3);
- lineto(tag, p4);
- lineto(tag, p1);
- swf_ShapeSetEnd(tag);
+ swf_SetRect(i->tag,&r);
+ swf_SetShapeStyles(i->tag,i->shape);
+ swf_ShapeCountBits(i->shape,NULL,NULL);
+ swf_SetShapeBits(i->tag,i->shape);
+ swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0);
+ i->swflastx = i->swflasty = 0;
+ moveto(obj, i->tag, p1);
+ lineto(obj, i->tag, p2);
+ lineto(obj, i->tag, p3);
+ lineto(obj, i->tag, p4);
+ lineto(obj, i->tag, p1);
+ swf_ShapeSetEnd(i->tag);
if(!mouseover)
{
- tag = swf_InsertTag(tag,ST_DEFINEBUTTON);
- swf_SetU16(tag,buttonid); //id
- swf_ButtonSetFlags(tag, 0); //menu=no
- swf_ButtonSetRecord(tag,0x01,myshapeid,depth,0,0);
- swf_ButtonSetRecord(tag,0x02,myshapeid2,depth,0,0);
- swf_ButtonSetRecord(tag,0x04,myshapeid2,depth,0,0);
- swf_ButtonSetRecord(tag,0x08,myshapeid,depth,0,0);
- swf_SetU8(tag,0);
- swf_ActionSet(tag,actions1);
- swf_SetU8(tag,0);
+ i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON);
+ swf_SetU16(i->tag,buttonid); //id
+ swf_ButtonSetFlags(i->tag, 0); //menu=no
+ swf_ButtonSetRecord(i->tag,0x01,myshapeid,i->depth,0,0);
+ swf_ButtonSetRecord(i->tag,0x02,myshapeid2,i->depth,0,0);
+ swf_ButtonSetRecord(i->tag,0x04,myshapeid2,i->depth,0,0);
+ swf_ButtonSetRecord(i->tag,0x08,myshapeid,i->depth,0,0);
+ swf_SetU8(i->tag,0);
+ swf_ActionSet(i->tag,actions1);
+ swf_SetU8(i->tag,0);
}
else
{
- tag = swf_InsertTag(tag,ST_DEFINEBUTTON2);
- swf_SetU16(tag,buttonid); //id
- swf_ButtonSetFlags(tag, 0); //menu=no
- swf_ButtonSetRecord(tag,0x01,myshapeid,depth,0,0);
- swf_ButtonSetRecord(tag,0x02,myshapeid2,depth,0,0);
- swf_ButtonSetRecord(tag,0x04,myshapeid2,depth,0,0);
- swf_ButtonSetRecord(tag,0x08,myshapeid,depth,0,0);
- swf_SetU8(tag,0); // end of button records
- swf_ButtonSetCondition(tag, BC_IDLE_OVERUP);
- swf_ActionSet(tag,actions1);
+ i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON2);
+ swf_SetU16(i->tag,buttonid); //id
+ swf_ButtonSetFlags(i->tag, 0); //menu=no
+ swf_ButtonSetRecord(i->tag,0x01,myshapeid,i->depth,0,0);
+ swf_ButtonSetRecord(i->tag,0x02,myshapeid2,i->depth,0,0);
+ swf_ButtonSetRecord(i->tag,0x04,myshapeid2,i->depth,0,0);
+ swf_ButtonSetRecord(i->tag,0x08,myshapeid,i->depth,0,0);
+ swf_SetU8(i->tag,0); // end of button records
+ swf_ButtonSetCondition(i->tag, BC_IDLE_OVERUP);
+ swf_ActionSet(i->tag,actions1);
if(actions2) {
- swf_ButtonSetCondition(tag, BC_OVERUP_IDLE);
- swf_ActionSet(tag,actions2);
- swf_SetU8(tag,0);
- swf_ButtonPostProcess(tag, 2);
+ swf_ButtonSetCondition(i->tag, BC_OVERUP_IDLE);
+ swf_ActionSet(i->tag,actions2);
+ swf_SetU8(i->tag,0);
+ swf_ButtonPostProcess(i->tag, 2);
} else {
- swf_SetU8(tag,0);
- swf_ButtonPostProcess(tag, 1);
+ swf_SetU8(i->tag,0);
+ swf_ButtonPostProcess(i->tag, 1);
}
}
- tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
+ i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
if(posx!=0 || posy!=0) {
+ SPOINT p;
+ p.x = (int)(posx*20);
+ p.y = (int)(posy*20);
+ p = swf_TurnPoint(p, &i->page_matrix);
MATRIX m;
- swf_GetMatrix(0,&m);
- m.tx = (int)(posx*20);
- m.ty = (int)(posy*20);
- swf_ObjectPlace(tag, buttonid, depth++,&m,0,0);
+ m = i->page_matrix;
+ m.tx = p.x;
+ m.ty = p.y;
+ swf_ObjectPlace(i->tag, buttonid, i->depth++,&m,0,0);
}
else {
- swf_ObjectPlace(tag, buttonid, depth++,0,0,0);
+ swf_ObjectPlace(i->tag, buttonid, i->depth++,&i->page_matrix,0,0);
}
}
double x3,double y3,
double x4,double y4)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
RGBA rgb;
SRECT r;
int lsid=0;
m.r0 = (int)(65536*20*(p1.x-p2.x)/sizey);
m.sy = -(int)(65536*20*(p1.y-p2.y)/sizey);
- m.tx = (int)(p1.x*20);
- m.ty = (int)(p1.y*20);
+ m.tx = (int)(p1.x*20) - 10;
+ m.ty = (int)(p1.y*20) - 10;
/* shape */
- myshapeid = ++currentswfid;
- tag = swf_InsertTag(tag,ST_DEFINESHAPE);
+ myshapeid = ++i->currentswfid;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
+ SHAPE*shape;
swf_ShapeNew(&shape);
- //lsid = ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb);
+ //lsid = ShapeAddLineStyle(shape,linewidth,&obj->strokergb);
//fsid = ShapeAddSolidFillStyle(shape,&obj->fillrgb);
fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1);
- swf_SetU16(tag, myshapeid);
+ swf_SetU16(i->tag, myshapeid);
r.xmin = (int)(xmin*20);
r.ymin = (int)(ymin*20);
r.xmax = (int)(xmax*20);
r.ymax = (int)(ymax*20);
- swf_SetRect(tag,&r);
- swf_SetShapeStyles(tag,shape);
+ swf_SetRect(i->tag,&r);
+ swf_SetShapeStyles(i->tag,shape);
swf_ShapeCountBits(shape,NULL,NULL);
- swf_SetShapeBits(tag,shape);
- swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,lsid,fsid,0);
- swflastx = swflasty = 0;
- moveto(tag, p1);
- lineto(tag, p2);
- lineto(tag, p3);
- lineto(tag, p4);
- lineto(tag, p1);
+ swf_SetShapeBits(i->tag,shape);
+ swf_ShapeSetAll(i->tag,shape,/*x*/0,/*y*/0,lsid,fsid,0);
+ i->swflastx = i->swflasty = 0;
+ moveto(obj, i->tag, p1);
+ lineto(obj, i->tag, p2);
+ lineto(obj, i->tag, p3);
+ lineto(obj, i->tag, p4);
+ lineto(obj, i->tag, p1);
/*
ShapeMoveTo (tag, shape, (int)(x1*20),(int)(y1*20));
ShapeSetLine (tag, shape, (int)(x1*20);
ShapeSetLine (tag, shape, x*20,0);
ShapeSetLine (tag, shape, 0,-y*20);
ShapeSetLine (tag, shape, -x*20,0);*/
- swf_ShapeSetEnd(tag);
+ swf_ShapeSetEnd(i->tag);
+ swf_ShapeFree(shape);
/* instance */
- tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(tag,myshapeid,/*depth*/depth++,NULL,NULL,NULL);
+ i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
+
+ swf_ObjectPlace(i->tag,myshapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL);
}
int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,int sizey,
double x3,double y3,
double x4,double y4)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
TAG*oldtag;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
-
- int bitid = ++currentswfid;
- oldtag = tag;
- tag = swf_InsertTag(tag,ST_DEFINEBITSJPEG2);
- swf_SetU16(tag, bitid);
- if(swf_SetJPEGBits(tag, filename, jpegquality)<0) {
- swf_DeleteTag(tag);
- tag = oldtag;
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
+
+ int bitid = ++i->currentswfid;
+ oldtag = i->tag;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG2);
+ swf_SetU16(i->tag, bitid);
+ if(swf_SetJPEGBits(i->tag, filename, config_jpegquality)<0) {
+ swf_DeleteTag(i->tag);
+ i->tag = oldtag;
return -1;
}
double x3,double y3,
double x4,double y4)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
TAG*oldtag;
JPEGBITS*jpeg;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
- int bitid = ++currentswfid;
- oldtag = tag;
- tag = swf_InsertTag(tag,ST_DEFINEBITSJPEG2);
- swf_SetU16(tag, bitid);
- swf_SetJPEGBits2(tag,sizex,sizey,mem,jpegquality);
+ int bitid = ++i->currentswfid;
+ oldtag = i->tag;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG2);
+ swf_SetU16(i->tag, bitid);
+ swf_SetJPEGBits2(i->tag,sizex,sizey,mem,config_jpegquality);
drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
return bitid;
}
double x3,double y3,
double x4,double y4)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
TAG*oldtag;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
-
- int bitid = ++currentswfid;
- oldtag = tag;
- tag = swf_InsertTag(tag,ST_DEFINEBITSLOSSLESS);
- swf_SetU16(tag, bitid);
- if(swf_SetLosslessBits(tag,sizex,sizey,mem, BMF_32BIT)<0) {
- swf_DeleteTag(tag);
- tag = oldtag;
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
+
+ int bitid = ++i->currentswfid;
+ oldtag = i->tag;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS);
+ swf_SetU16(i->tag, bitid);
+ if(swf_SetLosslessBits(i->tag,sizex,sizey,mem, BMF_32BIT)<0) {
+ swf_DeleteTag(i->tag);
+ i->tag = oldtag;
return -1;
}
double x3,double y3,
double x4,double y4, int n)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
TAG*oldtag;
U8*mem2 = 0;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
if(sizex&3)
{
mem = mem2;
}
- int bitid = ++currentswfid;
- oldtag = tag;
- tag = swf_InsertTag(tag,ST_DEFINEBITSLOSSLESS2);
- swf_SetU16(tag, bitid);
- if(swf_SetLosslessBitsIndexed(tag,sizex,sizey,mem, pal, n)<0) {
- swf_DeleteTag(tag);
- tag = oldtag;
+ int bitid = ++i->currentswfid;
+ oldtag = i->tag;
+ i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS2);
+ swf_SetU16(i->tag, bitid);
+ if(swf_SetLosslessBitsIndexed(i->tag,sizex,sizey,mem, pal, n)<0) {
+ swf_DeleteTag(i->tag);
+ i->tag = oldtag;
return -1;
}
if(mem2)
double x3,double y3,
double x4,double y4)
{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
if(id<0) return;
- if(shapeid>=0)
- endshape();
- if(textid>=0)
- endtext();
+ if(i->shapeid>=0)
+ endshape(obj,0);
+ if(i->textid>=0)
+ endtext(obj);
drawimage(obj, id, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4);
}
+void swfoutput_setparameter(char*name, char*value)
+{
+ if(!strcmp(name, "drawonlyshapes")) {
+ config_drawonlyshapes = atoi(value);
+ } else if(!strcmp(name, "ignoredraworder")) {
+ config_ignoredraworder = atoi(value);
+ } else if(!strcmp(name, "filloverlap")) {
+ config_filloverlap = atoi(value);
+ } else if(!strcmp(name, "linksopennewwindow")) {
+ config_opennewwindow = atoi(value);
+ } else if(!strcmp(name, "opennewwindow")) {
+ config_opennewwindow = atoi(value);
+ } else if(!strcmp(name, "storeallcharacters")) {
+ config_storeallcharacters = atoi(value);
+ } else if(!strcmp(name, "enablezlib")) {
+ config_enablezlib = atoi(value);
+ } else if(!strcmp(name, "insertstop")) {
+ config_insertstoptag = atoi(value);
+ } else if(!strcmp(name, "protected")) {
+ config_protect = atoi(value);
+ } else if(!strcmp(name, "flashversion")) {
+ config_flashversion = atoi(value);
+ } else if(!strcmp(name, "minlinewidth")) {
+ config_minlinewidth = atof(value);
+ } else if(!strcmp(name, "jpegquality")) {
+ int val = atoi(value);
+ if(val<0) val=0;
+ if(val>100) val=100;
+ config_jpegquality = val;
+ } else if(!strcmp(name, "splinequality")) {
+ int v = atoi(value);
+ v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel
+ if(v<1) v = 1;
+ config_splinemaxerror = v;
+ } else if(!strcmp(name, "fontquality")) {
+ int v = atoi(value);
+ v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel
+ if(v<1) v = 1;
+ config_fontsplinemaxerror = v;
+ } else {
+ fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value);
+ }
+}
+