int splinemaxerror=1;
int fontsplinemaxerror=1;
int filloverlap=0;
-float minlinewidth=0.1;
+float minlinewidth=0.05;
static char storefont = 0;
static int flag_protected = 0;
static int depth = 1;
static int startdepth = 1;
static int linewidth = 0;
+static SRECT lastpagesize;
static SHAPE* shape;
static int shapeid = -1;
static void startshape(struct swfoutput* obj);
static void starttext(struct swfoutput* obj);
-static void endshape(int clip);
+static void endshape(struct swfoutput* obj,int clip);
static void endtext(struct swfoutput* obj);
// matrix multiplication. changes p0
On SWF side, we need to start a new shape for each
closed polygon, because SWF only knows EOFILL.
*/
- endshape(0);
+ endshape(output,0);
startshape(output);
startFill();
}
int back = 0;
if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) {
- endshape(0);
+ endshape(output,0);
startshape(output);
SWF_OUTLINE *last, *tmp=outline;
plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3;
if(line_cap == LINE_CAP_BUTT) {
lineto(tag, q0);
- endshape(depth+2-nr);
+ endshape(output, depth+2-nr);
startshape(output);
}
p0 = m0;
drawShortPath(output,x,y,m,outline);
if(line_cap == LINE_CAP_BUTT) {
- endshape(0);
+ endshape(output,0);
startshape(output);
}
}
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(0);startshape(output);
+ endshape(output,0);startshape(output);
startFill();
}
fontlist_t*next;
} *fontlist = 0;
-/* todo: why don't higher values (64, 1024) work here? */
-#define FONT_INTERNAL_SIZE 1
+/* 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 int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m)
}
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid<0)
starttext(obj);
so we better start a new shape here if the polygon is filled
*/
if(shapeid>=0 && fill && !ignoredraworder) {
- endshape(0);
+ endshape(output,0);
}
if(shapeid<0)
if(textid>=0)
endtext(output);
if(shapeid>=0)
- endshape(0);
+ endshape(output,0);
assert(shapeid<0);
startshape(output);
stopFill();
int getCharID(SWFFONT *font, int charnr, char *charname, int u)
{
int t;
- if(charname) {
+ 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;
}
}
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;
}
}
if(u>0) {
/* 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];
}
}
if(charnr>=0 && charnr<font->numchars) {
+ msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
return charnr;
}
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];
}
}
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[iii], swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen,
+ 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,
return drawchar(obj, obj->swffont, character, charnr, u, &m);
}
+static void endpage(struct swfoutput*obj)
+{
+ if(shapeid>=0)
+ endshape(obj,0);
+ if(textid>=0)
+ endtext(obj);
+ 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);
+}
+
+static int firstpage = 1;
+void swfoutput_newpage(struct swfoutput*obj, int pageNum, int x1, int y1, int x2, int y2)
+{
+ if(!firstpage)
+ endpage(obj);
+
+ for(depth--;depth>=startdepth;depth--) {
+ tag = swf_InsertTag(tag,ST_REMOVEOBJECT2);
+ swf_SetU16(tag,depth);
+ }
+ depth = startdepth = 3; /* leave room for clip and background rectangle */
+
+ sizex = x2;
+ sizey = y2;
+ x1*=20;y1*=20;x2*=20;y2*=20;
+
+ if(lastpagesize.xmin != x1 ||
+ lastpagesize.xmax != x2 ||
+ lastpagesize.ymin != y1 ||
+ lastpagesize.ymax != y2)
+ {/* add white clipping rectangle */
+ msg("<notice> processing page %d (%dx%d)", pageNum,sizex,sizey);
+
+ if(!firstpage) {
+ msg("<notice> Page has a different size than previous ones");
+ tag = swf_InsertTag(tag,ST_REMOVEOBJECT2);
+ swf_SetU16(tag,1);
+ tag = swf_InsertTag(tag,ST_REMOVEOBJECT2);
+ swf_SetU16(tag,2);
+ }
+
+ RGBA rgb;
+ rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
+ SRECT r;
+ SHAPE* s;
+ int ls1=0,fs1=0;
+ int shapeid = ++currentswfid;
+ r.xmin = x1;
+ r.ymin = y1;
+ r.xmax = x2;
+ r.ymax = y2;
+ tag = swf_InsertTag(tag, ST_DEFINESHAPE);
+ swf_ShapeNew(&s);
+ fs1 = swf_ShapeAddSolidFillStyle(s, &rgb);
+ swf_SetU16(tag,shapeid);
+ swf_SetRect(tag,&r);
+ swf_SetShapeHeader(tag,s);
+ swf_ShapeSetAll(tag,s,x1,y1,ls1,fs1,0);
+ swf_ShapeSetLine(tag,s,(x2-x1),0);
+ swf_ShapeSetLine(tag,s,0,(y2-y1));
+ swf_ShapeSetLine(tag,s,(x1-x2),0);
+ swf_ShapeSetLine(tag,s,0,(y1-y2));
+ swf_ShapeSetEnd(tag);
+ swf_ShapeFree(s);
+ tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
+ swf_ObjectPlace(tag,shapeid,/*depth*/1,0,0,0);
+ tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
+ swf_ObjectPlaceClip(tag,shapeid,/*depth*/2,0,0,0,65535);
+ } else {
+ msg("<notice> processing page %d", pageNum);
+ }
+
+ lastpagesize.xmin = x1;
+ lastpagesize.xmax = x2;
+ lastpagesize.ymin = y1;
+ lastpagesize.ymax = y2;
+ swf_ExpandRect2(&swf.movieSize, &lastpagesize);
+
+ firstpage = 0;
+}
+
/* initialize the swf writer */
-void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x2, int y2)
+void swfoutput_init(struct swfoutput* obj, char*_filename)
{
- RGBA rgb;
SRECT r;
+ RGBA rgb;
memset(obj, 0, sizeof(struct swfoutput));
filename = _filename;
- sizex = x2;
- sizey = y2;
msg("<verbose> initializing swf output for size %d*%d\n", sizex,sizey);
obj->drawmode = -1;
memset(&swf,0x00,sizeof(SWF));
+ memset(&lastpagesize,0x00,sizeof(SRECT));
swf.fileVersion = flashversion;
swf.frameRate = 0x0040; // 1 frame per 4 seconds
- swf.movieSize.xmin = 20*x1;
- swf.movieSize.ymin = 20*y1;
- swf.movieSize.xmax = 20*x2;
- swf.movieSize.ymax = 20*y2;
-
- depth = 1;
+ swf.movieSize.xmin = 0;
+ swf.movieSize.ymin = 0;
+ swf.movieSize.xmax = 0;
+ swf.movieSize.ymax = 0;
swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
tag = swf.firstTag;
rgb.a = rgb.r = rgb.g = rgb.b = 0xff;
swf_SetRGB(tag,&rgb);
- if(1)/* add white rectangle */
- {
- SRECT r;
- SHAPE* s;
- int ls1=0,fs1=0;
- int shapeid = ++currentswfid;
- r.xmin = x1*20;
- r.ymin = y1*20;
- r.xmax = x2*20;
- r.ymax = y2*20;
- tag = swf_InsertTag(tag, ST_DEFINESHAPE);
- swf_ShapeNew(&s);
- fs1 = swf_ShapeAddSolidFillStyle(s, &rgb);
- swf_SetU16(tag,shapeid);
- swf_SetRect(tag,&r);
- swf_SetShapeHeader(tag,s);
- swf_ShapeSetAll(tag,s,x1*20,y1*20,ls1,fs1,0);
- swf_ShapeSetLine(tag,s,20*(x2-x1),0);
- swf_ShapeSetLine(tag,s,0,20*(y2-y1));
- swf_ShapeSetLine(tag,s,20*(x1-x2),0);
- swf_ShapeSetLine(tag,s,0,20*(y1-y2));
- swf_ShapeSetEnd(tag);
- swf_ShapeFree(s);
- tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
- swf_ObjectPlace(tag,shapeid,depth++,0,0,0);
- tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
- swf_ObjectPlaceClip(tag,shapeid,depth++,0,0,0,65535);
- }
-
if(flag_protected)
tag = swf_InsertTag(tag, ST_PROTECT);
- startdepth = depth;
+ startdepth = depth = 0;
}
void swfoutput_setprotected() //write PROTECT tag
shapeid = ++currentswfid;
swf_SetU16(tag,shapeid); // ID
- /* TODO: patch back */
bboxrectpos = tag->len;
r.xmin = 0;
r.ymin = 0;
static void starttext(struct swfoutput*obj)
{
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
textid = ++currentswfid;
tag->pos = tag->readBit = 0;
}
-void fixAreas()
+void cancelshape(swfoutput*obj)
+{
+ /* delete old shape tag */
+ TAG*todel = tag;
+ tag = tag->prev;
+ swf_DeleteTag(todel);
+ shapeid = -1;
+ bboxrectpos = -1;
+}
+
+void fixAreas(swfoutput*obj)
{
if(!shapeisempty && fill &&
(bboxrect.xmin == bboxrect.xmax ||
bboxrect.ymin == bboxrect.ymax) &&
minlinewidth >= 0.001
) {
- SRECT r = bboxrect;
- msg("<debug> Shape has size 0");
+ msg("<debug> Shape has size 0: width=%.2f height=%.2f",
+ (bboxrect.xmax-bboxrect.xmin)/20.0,
+ (bboxrect.ymax-bboxrect.ymin)/20.0
+ );
+ SRECT r = bboxrect;
+
if(r.xmin == r.xmax && r.ymin == r.ymax) {
/* this thing comes down to a single dot- nothing to fix here */
return;
}
- double x=0,y=0;
- if(r.xmin == r.xmax) {
- x = minlinewidth;
- } else {
- y = minlinewidth;
- }
- /* warning: doing this inside endshape() is dangerous */
- moveto(tag, r.xmin/20.0 , r.ymin/20.0);
- lineto(tag, r.xmax/20.0 + x, r.ymin/20.0);
- lineto(tag, r.xmax/20.0 + x, r.ymax/20.0 + y);
- lineto(tag, r.xmin/20.0 , r.ymax/20.0 + y);
- lineto(tag, r.xmin/20.0 , r.ymin/20.0);
+ cancelshape(obj);
+
+ RGBA save_col = obj->strokergb;
+ int save_width = linewidth;
+
+ obj->strokergb = obj->fillrgb;
+ linewidth = (int)(minlinewidth*20);
+ if(linewidth==0) linewidth = 1;
+
+ startshape(obj);
+
+ moveto(tag, r.xmin/20.0,r.ymin/20.0);
+ lineto(tag, r.xmax/20.0,r.ymax/20.0);
+
+ obj->strokergb = save_col;
+ linewidth = save_width;
}
}
-static void endshape(int clipdepth)
+static void endshape(swfoutput*obj, int clipdepth)
{
if(shapeid<0)
return;
if(!clipdepth)
- fixAreas();
+ fixAreas(obj);
if(shapeisempty ||
(bboxrect.xmin == bboxrect.xmax && bboxrect.ymin == bboxrect.ymax))
{
- // delete the tag again, we didn't do anything
- TAG*todel = tag;
- tag = tag->prev;
- swf_DeleteTag(todel);
- shapeid = -1;
- bboxrectpos = -1;
+ // delete the shape again, we didn't do anything
+ cancelshape(obj);
return;
}
bboxrectpos = -1;
}
-static void endpage(struct swfoutput*obj)
-{
- if(shapeid>=0)
- endshape(0);
- if(textid>=0)
- endtext(obj);
- 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);
-}
-
-void swfoutput_newpage(struct swfoutput*obj)
-{
- endpage(obj);
-
- for(depth--;depth>=startdepth;depth--) {
- tag = swf_InsertTag(tag,ST_REMOVEOBJECT2);
- swf_SetU16(tag,depth);
- }
-
- depth = startdepth;
-}
-
/* Perform cleaning up, complete the swf, and write it out. */
void swfoutput_destroy(struct swfoutput* obj)
{
obj->fillrgb.b == b &&
obj->fillrgb.a == a) return;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
obj->fillrgb.r = r;
obj->fillrgb.g = g;
obj->strokergb.a == a) return;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
obj->strokergb.r = r;
obj->strokergb.g = g;
obj->strokergb.b = b;
return;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
linewidth = (u16)(_linewidth*20);
}
if(textid>=0)
endtext(obj);
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(clippos >= 127)
{
if(textid>=0)
endtext(obj);
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(!clippos) {
msg("<error> Invalid end of clipping region");
}
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
ActionTAG* actions;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
char mouseover = 1;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
{
TAG*oldtag;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
JPEGBITS*jpeg;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
{
TAG*oldtag;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
TAG*oldtag;
U8*mem2 = 0;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
{
if(id<0) return;
if(shapeid>=0)
- endshape(0);
+ endshape(obj,0);
if(textid>=0)
endtext(obj);
git.asbjorn.biz / swftools.git / blobdiff