#include "../lib/gfxdevice.h"
#include "../lib/gfxtools.h"
}
-#include "../lib/libart/libart.h"
+#include "../lib/art/libart.h"
#define CHARDATAMAX 8192
#define CHARMIDX 0
void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color);
void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform);
-void swf_fillgradient(gfxdevice_t*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix);
+void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix);
static swfoutput_internal* init_internal_struct()
{
i->storefont = 0;
i->currentswfid = 0;
- i->depth = 1;
- i->startdepth = 1;
+ i->depth = 0;
+ i->startdepth = 0;
i->linewidth = 0;
i->shapeid = -1;
i->textid = -1;
return i;
};
+static int id_error = 0;
+
+static U16 getNewID(struct swfoutput* obj)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->currentswfid == 65535) {
+ if(!id_error)
+ msg("<error> ID Table overflow");
+ id_error=1;
+ }
+ return ++i->currentswfid;
+}
+
static void startshape(struct swfoutput* obj);
static void starttext(struct swfoutput* obj);
static void endshape(struct swfoutput* obj);
}
return 0;
}
-static int moveto(struct swfoutput*obj, TAG*tag, float x, float y)
+static int moveto(struct swfoutput*obj, TAG*tag, double x, double y)
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
plotxy p;
}
}
+/*static void plot(struct swfoutput*obj, int x, int y, TAG*tag)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ int width = i->linewidth/4;
+ if(width > 5)
+ width = 5;
+ ////square
+ //swf_ShapeSetLine(tag, i->shape,-width,-width);
+ //swf_ShapeSetLine(tag, i->shape,width*2,0);
+ //swf_ShapeSetLine(tag, i->shape,0,width*2);
+ //swf_ShapeSetLine(tag, i->shape,-width*2,0);
+ //swf_ShapeSetLine(tag, i->shape,0,-width*2);
+ //swf_ShapeSetLine(tag, i->shape,width,width);
+
+ // diamond
+ swf_ShapeSetLine(tag, i->shape,-width,0);
+ swf_ShapeSetLine(tag, i->shape,width,-width);
+ swf_ShapeSetLine(tag, i->shape,width,width);
+ swf_ShapeSetLine(tag, i->shape,-width,width);
+ swf_ShapeSetLine(tag, i->shape,-width,-width);
+ swf_ShapeSetLine(tag, i->shape,width,0);
+
+ addPointToBBox(obj, x-width ,y-width);
+ addPointToBBox(obj, x+width ,y+width);
+}*/
+
// write a line-to command into the swf
static void lineto(struct swfoutput*obj, TAG*tag, plotxy p0)
{
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, i->shape, rx,ry);
-
- addPointToBBox(obj, i->swflastx,i->swflasty);
- addPointToBBox(obj, px,py);
+ if(rx|ry) {
+ swf_ShapeSetLine (tag, i->shape, rx,ry);
+ addPointToBBox(obj, i->swflastx,i->swflasty);
+ addPointToBBox(obj, px,py);
+ }/* else if(!i->fill) {
+ // treat lines of length 0 as plots, making them
+ // at least 1 twip wide so Flash will display them
+ plot(obj, i->swflastx, i->swflasty, tag);
+ }*/
i->shapeisempty = 0;
i->swflastx+=rx;
addPointToBBox(obj, lastlastx ,lastlasty );
addPointToBBox(obj, lastlastx+cx,lastlasty+cy);
addPointToBBox(obj, lastlastx+cx+ex,lastlasty+cy+ey);
- }
+ }/* else if(!i->fill) {
+ // treat splines of length 0 as plots
+ plot(obj, lastlastx, lastlasty, tag);
+ }*/
i->shapeisempty = 0;
}
/* write a line, given two points and the transformation
matrix. */
-static void line(struct swfoutput*obj, TAG*tag, plotxy p0, plotxy p1)
+/*static void line(struct swfoutput*obj, TAG*tag, plotxy p0, plotxy p1)
{
moveto(obj, tag, p0);
lineto(obj, tag, p1);
-}
+}*/
void resetdrawer(struct swfoutput*obj)
{
FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars);
return 0;
}
+ /*if(swffont->glyph[charid].shape->bitlen <= 16) {
+ msg("<warning> Character '%s' (c=%d,u=%d), glyph %d in current charset (%s, %d characters) is empty",
+ FIXNULL(character),charnr, u, charid, FIXNULL((char*)swffont->name), swffont->numchars);
+ return 0;
+ }*/
+
if(i->shapeid>=0)
endshape(obj);
MATRIX m2;
swf_MatrixJoin(&m2,&obj->fontmatrix, &i->page_matrix);
- swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&m2,NULL,NULL);
+ swf_ObjectPlace(i->tag,i->textid,/*depth*/++i->depth,&m2,NULL,NULL);
i->textid = -1;
}
}
}
- swf_FontSetID(swffont, ++i->currentswfid);
+ swf_FontSetID(swffont, getNewID(obj));
if(getScreenLogLevel() >= LOGLEVEL_DEBUG) {
// print font information
i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME);
i->frameno ++;
- for(i->depth--;i->depth>=i->startdepth;i->depth--) {
+ for(i->depth;i->depth>i->startdepth;i->depth--) {
i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2);
swf_SetU16(i->tag,i->depth);
}
SRECT r;
SHAPE* s;
int ls1=0,fs1=0;
- int shapeid = ++i->currentswfid;
+ int shapeid = getNewID(obj);
r.xmin = x1;
r.ymin = y1;
r.xmax = x2;
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);
+ 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);
+ swf_ObjectPlaceClip(i->tag,shapeid,++i->depth,0,0,0,65535);
i->cliptag = i->tag;
}
if(i->cliptag && i->frameno == i->lastframeno) {
SWFPLACEOBJECT obj;
swf_GetPlaceObject(i->cliptag, &obj);
- obj.clipdepth = i->depth++;
+ obj.clipdepth = i->depth;
swf_ResetTag(i->cliptag, i->cliptag->id);
swf_SetPlaceObject(i->cliptag, &obj);
swf_PlaceObjectFree(&obj);
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 */
+ i->startdepth = i->depth = 0;
if(config_protect)
i->tag = swf_InsertTag(i->tag, ST_PROTECT);
i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&obj->strokergb);
i->fillstyleid = swf_ShapeAddSolidFillStyle(i->shape,&obj->fillrgb);
- i->shapeid = ++i->currentswfid;
+ i->shapeid = getNewID(obj);
+
+ msg("<debug> Using shape id %d", i->shapeid);
+
swf_SetU16(i->tag,i->shapeid); // ID
i->bboxrectpos = i->tag->len;
if(i->shapeid>=0)
endshape(obj);
- i->textid = ++i->currentswfid;
+ i->textid = getNewID(obj);
i->swflastx=i->swflasty=0;
}
i->bboxrect.ymin == i->bboxrect.ymax))
{
// delete the shape again, we didn't do anything
+ msg("<debug> cancelling shape: bbox is (%f,%f,%f,%f)",
+ i->bboxrect.xmin /20.0,
+ i->bboxrect.ymin /20.0,
+ i->bboxrect.xmax /20.0,
+ i->bboxrect.ymax /20.0
+ );
cancelshape(obj);
return;
}
changeRect(obj, i->tag, i->bboxrectpos, &i->bboxrect);
+ msg("<trace> Placing shape id %d", i->shapeid);
+
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(i->tag,i->shapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL);
+ 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;
i->fill=0;
+
+ /*int debug = 1;
+ if(debug) {
+ char text[80];
+ sprintf(text, "id%d", i->shapeid);
+ swfcoord points[4];
+ points[0].x = i->bboxrect.xmin;
+ points[0].y = i->bboxrect.ymin;
+ points[1].x = i->bboxrect.xmax;
+ points[1].y = i->bboxrect.ymin;
+ points[2].x = i->bboxrect.xmax;
+ points[2].y = i->bboxrect.ymax;
+ points[3].x = i->bboxrect.xmin;
+ points[3].y = i->bboxrect.ymax;
+ swfoutput_namedlink(obj,text,points);
+ }*/
}
void swfoutput_finalize(struct swfoutput*obj)
double posx = 0;
double posy = 0;
int t;
- int buttonid = ++i->currentswfid;
+ int buttonid = getNewID(obj);
for(t=1;t<4;t++)
{
if(points[t].x>xmax) xmax=points[t].x;
xmax -= posx; ymax -= posy;
/* shape */
- myshapeid = ++i->currentswfid;
+ myshapeid = getNewID(obj);
i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
swf_ShapeNew(&i->shape);
rgb.r = rgb.b = rgb.a = rgb.g = 0;
swf_ShapeSetEnd(i->tag);
/* shape2 */
- myshapeid2 = ++i->currentswfid;
+ myshapeid2 = getNewID(obj);
i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
swf_ShapeNew(&i->shape);
rgb.r = rgb.b = rgb.a = rgb.g = 255;
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(i->tag, buttonid, i->depth++,&i->page_matrix,0,0);
+ swf_ObjectPlace(i->tag, buttonid, ++i->depth,&m,0,0);
+ } else {
+ swf_ObjectPlace(i->tag, buttonid, ++i->depth,&i->page_matrix,0,0);
}
}
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
gfxcoord_t lastx=0,lasty=0,px=0,py=0;
- int needsfix = 0;
+ char lastwasmoveto;
while(1) {
if(!line)
break;
+ /* check whether the next segment is zero */
if(line->type == gfx_moveTo) {
+ msg("<trace> ======== moveTo %.2f %.2f", line->x, line->y);
moveto(obj, i->tag, line->x, line->y);
px = lastx = line->x;
py = lasty = line->y;
- needsfix = 0;
+ lastwasmoveto = 1;
} if(line->type == gfx_lineTo) {
+ msg("<trace> ======== lineTo %.2f %.2f", line->x, line->y);
lineto(obj, i->tag, line->x, line->y);
px = line->x;
py = line->y;
- needsfix = 1;
+ lastwasmoveto = 0;
} else if(line->type == gfx_splineTo) {
+ msg("<trace> ======== splineTo %.2f %.2f", line->x, line->y);
plotxy s,p;
s.x = line->sx;p.x = line->x;
s.y = line->sy;p.y = line->y;
splineto(obj, i->tag, s, p);
px = line->x;
py = line->y;
- needsfix = 1;
+ lastwasmoveto = 0;
}
line = line->next;
}
}
}
-
-
static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int targetheight, int* newwidth, int* newheight)
{
+ swfoutput*obj = i->obj;
RGBA*newpic = 0;
RGBA*mem = (RGBA*)img->data;
- int bitid = ++i->currentswfid;
+ int bitid = getNewID(obj);
int sizex = img->width;
int sizey = img->height;
- int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0);
- int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey);
int is_jpeg = i->jpeg;
i->jpeg = 0;
}
/// }
- *newwidth = newsizex;
- *newheight = newsizey;
-
+ if(sizex<=0 || sizey<=0 || newsizex<=0 || newsizey<=0)
+ return -1;
/* TODO: cache images */
+ *newwidth = sizex;
+ *newheight = sizey;
+
+ if(newsizex<sizex || newsizey<sizey) {
+ msg("<notice> Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey);
+ newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey);
+ *newwidth = sizex = newsizex;
+ *newheight = sizey = newsizey;
+ mem = newpic;
+
+ }
+
+ int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0);
+ int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey);
msg("<verbose> Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors",
sizex, sizey,
/*newsizex, newsizey,*/
num_colors>256?">":"", num_colors>256?256:num_colors);
- if(newsizex!=sizex || newsizey!=sizey) {
- newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey);
- sizex = newsizex;
- sizey = newsizey;
- mem = newpic;
+ /*RGBA* pal = (RGBA*)rfx_alloc(sizeof(RGBA)*num_colors);
+ swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,pal);
+ int t;
+ for(t=0;t<num_colors;t++) {
+ printf("%02x%02x%02x%02x ",
+ pal[t].r, pal[t].g, pal[t].b, pal[t].a);
+ if((t&7)==7)
+ printf("\n");
}
+ printf("\n");*/
+
+ i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, config_jpegquality);
- if(has_alpha) {
- if(num_colors<=256 || sizex<8 || sizey<8) {
- i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS2);
- swf_SetU16(i->tag, bitid);
- swf_SetLosslessImage(i->tag,mem,sizex,sizey);
- } else {
- /*TODO: check what is smaller */
- i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG3);
- swf_SetU16(i->tag, bitid);
- swf_SetJPEGBits3(i->tag,sizex,sizey,mem,config_jpegquality);
- //swf_SetLosslessImage(i->tag,mem,sizex,sizey);
- }
- } else {
- if(num_colors<=256 || sizex<8) {
- i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS);
- swf_SetU16(i->tag, bitid);
- swf_SetLosslessImage(i->tag,mem,sizex,sizey);
- } else {
- /*TODO: check what is smaller */
- i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG2);
- swf_SetU16(i->tag, bitid);
- swf_SetJPEGBits2(i->tag,sizex,sizey,mem,config_jpegquality);
- //swf_SetLosslessImage(i->tag,mem,sizex,sizey);
- }
- }
-
if(newpic)
free(newpic);
int newwidth=0,newheight=0;
int bitid = add_image(i, img, targetx, targety, &newwidth, &newheight);
+ if(bitid<0)
+ return;
double fx = (double)img->width / (double)newwidth;
double fy = (double)img->height / (double)newheight;
m.ty = (int)(matrix->ty*20);
/* shape */
- int myshapeid = ++i->currentswfid;
+ int myshapeid = getNewID(obj);
i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
SHAPE*shape;
swf_ShapeNew(&shape);
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
CXFORM cxform2 = gfxcxform_to_cxform(cxform);
- swf_ObjectPlace(i->tag,myshapeid,/*depth*/i->depth++,&i->page_matrix,&cxform2,NULL);
+ swf_ObjectPlace(i->tag,myshapeid,/*depth*/++i->depth,&i->page_matrix,&cxform2,NULL);
}
void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
i->clippos --;
}
- int myshapeid = ++i->currentswfid;
+ int myshapeid = getNewID(obj);
i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
RGBA col;
memset(&col, 0, sizeof(RGBA));
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
i->cliptags[i->clippos] = i->tag;
i->clipshapes[i->clippos] = myshapeid;
- i->clipdepths[i->clippos] = i->depth++;
+ i->clipdepths[i->clippos] = ++i->depth;
i->clippos++;
}
return;
}
i->clippos--;
- swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,i->depth++);
+ /*swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,
+ / * clip to depth: * / i->depth <= i->clipdepths[i->clippos]? i->depth : i->depth - 1);
+ i->depth ++;*/
+ swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,i->depth);
}
int swf_setparameter(gfxdevice_t*dev, const char*key, const char*value)
{
int tmpsplines=0;
int lines=0;
int splines=0;
+ int haszerosegments=0;
while(line) {
if(line->type == gfx_moveTo) {
tmplines=0;
else return 4;
}
+int gfxline_has_dots(gfxline_t*line)
+{
+ int tmplines=0;
+ double x,y;
+ double dist = 0;
+ int isline = 0;
+ while(line) {
+ if(line->type == gfx_moveTo) {
+ if(isline && dist < 1) {
+ return 1;
+ }
+ dist = 0;
+ isline = 0;
+ } else if(line->type == gfx_lineTo) {
+ dist += fabs(line->x - x) + fabs(line->y - y);
+ isline = 1;
+ } else if(line->type == gfx_splineTo) {
+ dist += fabs(line->sx - x) + fabs(line->sy - y) +
+ fabs(line->x - line->sx) + fabs(line->y - line->sy);
+ isline = 1;
+ }
+ x = line->x;
+ y = line->y;
+ line = line->next;
+ }
+ if(isline && dist < 1) {
+ return 1;
+ }
+ return 0;
+}
+
+int gfxline_fix_short_edges(gfxline_t*line)
+{
+ double x,y;
+ while(line) {
+ if(line->type == gfx_lineTo) {
+ if(fabs(line->x - x) + fabs(line->y - y) < 0.01) {
+ line->x += 0.01;
+ }
+ } else if(line->type == gfx_splineTo) {
+ if(fabs(line->sx - x) + fabs(line->sy - y) +
+ fabs(line->x - line->sx) + fabs(line->y - line->sy) < 0.01) {
+ line->x += 0.01;
+ }
+ }
+ x = line->x;
+ y = line->y;
+ line = line->next;
+ }
+ return 0;
+}
+
+int shapenr = 0;
+
void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
swfoutput*obj = i->obj;
int type = gfxline_type(line);
+ int has_dots = gfxline_has_dots(line);
/* TODO: * split line into segments, and perform this check for all segments */
- if(width <= config_caplinewidth
- || (cap_style == gfx_capRound && joint_style == gfx_joinRound)
- || (cap_style == gfx_capRound && type<=2)) {
+ if(!has_dots &&
+ (width <= config_caplinewidth
+ || (cap_style == gfx_capRound && joint_style == gfx_joinRound)
+ || (cap_style == gfx_capRound && type<=2))) {
+ msg("<trace> draw as stroke, type=%d dots=%d", type, has_dots);
endtext(obj);
swfoutput_setstrokecolor(obj, color->r, color->g, color->b, color->a);
swfoutput_setlinewidth(obj, width);
stopFill(obj);
drawgfxline(obj, line);
} else {
+ msg("<trace> draw as polygon, type=%d dots=%d", type, has_dots);
+ if(has_dots)
+ gfxline_fix_short_edges(line);
/* we need to convert the line into a polygon */
ArtSVP* svp = gfxstrokeToSVP(line, width, cap_style, joint_style, miterLimit);
gfxline_t*gfxline = SVPtogfxline(svp);
startFill(obj);
i->fill=1;
drawgfxline(obj, line);
+ msg("<trace> end of swf_fill (shapeid=%d)", i->shapeid);
}
-void swf_fillgradient(gfxdevice_t*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
+void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
{
msg("<error> Gradient filling not implemented yet");
}