X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=b23f262733d45227664c18517f6af1712547c69a;hb=5eb77fbc6bca1b830002ead615f3bea90888ff39;hp=ff0cc231f3597eb412a5b5bb3163a208625b7bd0;hpb=916fb93fed7837d46de4254a0e623f6bc3d7e994;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index ff0cc23..b23f262 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -35,6 +35,7 @@ #include "../gfxdevice.h" #include "../gfxtools.h" #include "../art/libart.h" +#include "artsutils.c" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -77,18 +78,23 @@ typedef struct _swfoutput_internal int config_enablezlib; int config_insertstoptag; int config_flashversion; + int config_reordertags; + int config_showclipshapes; int config_splinemaxerror; int config_fontsplinemaxerror; int config_filloverlap; int config_protect; int config_bboxvars; int config_disable_polygon_conversion; + int config_normalize_polygon_positions; RGBA config_linkcolor; float config_minlinewidth; double config_caplinewidth; char* config_linktarget; char*config_internallinkfunction; char*config_externallinkfunction; + char config_animate; + double config_framerate; SWF* swf; @@ -147,8 +153,9 @@ typedef struct _swfoutput_internal char overflow; + int current_font_size; MATRIX fontmatrix; - double fontm11,fontm12,fontm21,fontm22; + double lastfontm11,lastfontm12,lastfontm21,lastfontm22; SWFFONT *swffont; RGBA strokergb; RGBA fillrgb; @@ -170,9 +177,9 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color); static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform); static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); -static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix); -static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font); -static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, char*action); +static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix); +static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font); +static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, const char*action); static void swf_startframe(gfxdevice_t*dev, int width, int height); static void swf_endframe(gfxdevice_t*dev); static gfxresult_t* swf_finish(gfxdevice_t*driver); @@ -223,16 +230,19 @@ static swfoutput_internal* init_internal_struct() i->config_generate_fake_tags=0; i->config_insertstoptag=0; i->config_flashversion=6; + i->config_framerate=0.25; i->config_splinemaxerror=1; i->config_fontsplinemaxerror=1; i->config_filloverlap=0; i->config_protect=0; i->config_bboxvars=0; + i->config_showclipshapes=0; i->config_minlinewidth=0.05; i->config_caplinewidth=1; i->config_linktarget=0; i->config_internallinkfunction=0; i->config_externallinkfunction=0; + i->config_reordertags=1; i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255; i->config_linkcolor.a = 0x40; @@ -246,8 +256,10 @@ static U16 getNewID(gfxdevice_t* dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(i->currentswfid == 65535) { - if(!id_error) + if(!id_error) { msg(" ID Table overflow"); + msg(" This file is too complex to render- SWF only supports 65536 shapes at once"); + } id_error=1; i->overflow = 1; exit(1); @@ -258,8 +270,10 @@ static U16 getNewDepth(gfxdevice_t* dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(i->depth == 65535) { - if(!id_error) + if(!id_error) { msg(" Depth Table overflow"); + msg(" This file is too complex to render- SWF only supports 65536 shapes at once"); + } id_error=1; i->overflow = 1; exit(1); @@ -668,10 +682,10 @@ static void putcharacter(gfxdevice_t*dev, int fontid, int charid, int x,int y, i /* 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 +#define GLYPH_SCALE 1 /* process a character. */ -static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix_t*m, gfxcolor_t*col) +static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, float x, float y, gfxcolor_t*col) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(!swffont) { @@ -694,21 +708,21 @@ static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix_t*m if(i->textid<0) starttext(dev); - float x = m->m31; - float y = m->m32; - float det = ((m->m11*m->m22)-(m->m21*m->m12)); + double det = i->fontmatrix.sx/65536.0 * i->fontmatrix.sy/65536.0 - + i->fontmatrix.r0/65536.0 * i->fontmatrix.r1/65536.0; + if(fabs(det) < 0.0005) { /* x direction equals y direction- the text is invisible */ return 1; } - det = 20*FONT_INTERNAL_SIZE / det; + det = 20 * GLYPH_SCALE / det; SPOINT p; - p.x = (SCOORD)(( x * m->m22 - y * m->m12)*det); - p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det); + p.x = (SCOORD)(( x * i->fontmatrix.sy/65536.0 - y * i->fontmatrix.r1/65536.0)*det); + p.y = (SCOORD)((- x * i->fontmatrix.r0/65536.0 + y * i->fontmatrix.sx/65536.0)*det); RGBA rgba = *(RGBA*)col; - putcharacter(dev, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE, rgba); + putcharacter(dev, swffont->id, charid,p.x,p.y,i->current_font_size, rgba); swf_FontUseGlyph(swffont, charid); return 1; } @@ -719,7 +733,7 @@ static void endtext(gfxdevice_t*dev) if(i->textid<0) return; - i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT); + i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT2); swf_SetU16(i->tag, i->textid); SRECT r; @@ -733,36 +747,56 @@ static void endtext(gfxdevice_t*dev) putcharacters(dev, i->tag); swf_SetU8(i->tag,0); - i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + if(i->swf->fileVersion >= 8) { + i->tag = swf_InsertTag(i->tag, ST_CSMTEXTSETTINGS); + swf_SetU16(i->tag, i->textid); + + //swf_SetU8(i->tag, /*subpixel grid*/(2<<3)|/*flashtype*/0x40); + swf_SetU8(i->tag, /*grid*/(1<<3)|/*flashtype*/0x40); + //swf_SetU8(i->tag, /*no grid*/(0<<3)|/*flashtype*/0x40); + + swf_SetU32(i->tag, 0);//thickness + swf_SetU32(i->tag, 0);//sharpness + swf_SetU8(i->tag, 0);//reserved + } + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag,i->textid,getNewDepth(dev),&i->page_matrix,NULL,NULL); i->textid = -1; } /* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */ -static void swfoutput_setfontmatrix(gfxdevice_t*dev,double m11,double m21, - double m12,double m22) +static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,double m22) { m11 *= 1024; m12 *= 1024; m21 *= 1024; m22 *= 1024; swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->fontm11 == m11 && - i->fontm12 == m12 && - i->fontm21 == m21 && - i->fontm22 == m22) + if(i->lastfontm11 == m11 && + i->lastfontm12 == m12 && + i->lastfontm21 == m21 && + i->lastfontm22 == m22) return; if(i->textid>=0) endtext(dev); - i->fontm11 = m11; - i->fontm12 = m12; - i->fontm21 = m21; - i->fontm22 = m22; + i->lastfontm11 = m11; + i->lastfontm12 = m12; + i->lastfontm21 = m21; + i->lastfontm22 = m22; + + double xsize = sqrt(m11*m11 + m12*m12); + double ysize = sqrt(m21*m21 + m22*m22); + i->current_font_size = (xsize>ysize?xsize:ysize)*1; + if(i->current_font_size < 1) + i->current_font_size = 1; + double ifs = 1.0 / (i->current_font_size*GLYPH_SCALE); + MATRIX m; - m.sx = (U32)(((i->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((i->fontm12)*65536)/FONT_INTERNAL_SIZE); - m.r0 = (U32)(((i->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((i->fontm22)*65536)/FONT_INTERNAL_SIZE); + m.sx = (U32)((m11*ifs)*65536); m.r1 = (U32)((m21*ifs)*65536); + m.r0 = (U32)((m12*ifs)*65536); m.sy = (U32)((m22*ifs)*65536); m.tx = 0; m.ty = 0; i->fontmatrix = m; @@ -872,6 +906,9 @@ static void setBackground(gfxdevice_t*dev, int x1, int y1, int x2, int y2) void gfxdevice_swf_init(gfxdevice_t* dev) { memset(dev, 0, sizeof(gfxdevice_t)); + + dev->name = "swf"; + dev->internal = init_internal_struct(); dev->startpage = swf_startframe; @@ -901,7 +938,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev) i->swf = (SWF*)rfx_calloc(sizeof(SWF)); i->swf->fileVersion = i->config_flashversion; - i->swf->frameRate = 0x0040; // 1 frame per 4 seconds + i->swf->frameRate = i->config_framerate*0x100; i->swf->movieSize.xmin = 0; i->swf->movieSize.ymin = 0; i->swf->movieSize.xmax = 0; @@ -925,9 +962,8 @@ static void startshape(gfxdevice_t*dev) if(i->shapeid>=0) return; - - if(i->textid>=0) - endtext(dev); + //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) + endtext(dev); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); @@ -1101,7 +1137,7 @@ static void endshape(gfxdevice_t*dev) changeRect(dev, i->tag, i->bboxrectpos, &i->bboxrect); - msg(" Placing shape id %d", i->shapeid); + msg(" Placing shape ID %d", i->shapeid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); MATRIX m = i->page_matrix; @@ -1109,6 +1145,10 @@ static void endshape(gfxdevice_t*dev) m.ty += i->shapeposy; swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(dev),&m,NULL,NULL); + if(i->config_animate) { + i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME); + } + swf_ShapeFree(i->shape); i->shape = 0; i->shapeid = -1; @@ -1180,12 +1220,15 @@ void swfoutput_finalize(gfxdevice_t*dev) while(iterator) { TAG*mtag = i->swf->firstTag; if(iterator->swffont) { - mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); if(!i->config_storeallcharacters) { msg(" Reducing font %s", iterator->swffont->name); swf_FontReduce(iterator->swffont); } - swf_FontSetDefine2(mtag, iterator->swffont); + int used = iterator->swffont->use && iterator->swffont->use->used_glyphs; + if(i->config_storeallcharacters || used) { + mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); + swf_FontSetDefine2(mtag, iterator->swffont); + } } iterator = iterator->next; @@ -1207,9 +1250,12 @@ void swfoutput_finalize(gfxdevice_t*dev) if(i->config_enablezlib || i->config_flashversion>=6) { i->swf->compressed = 1; } + +// if(i->config_reordertags) +// swf_Optimize(i->swf); } -int swfresult_save(gfxresult_t*gfx, char*filename) +int swfresult_save(gfxresult_t*gfx, const char*filename) { SWF*swf = (SWF*)gfx->internal; int fi; @@ -1235,7 +1281,7 @@ int swfresult_save(gfxresult_t*gfx, char*filename) close(fi); return 0; } -void* swfresult_get(gfxresult_t*gfx, char*name) +void* swfresult_get(gfxresult_t*gfx, const char*name) { SWF*swf = (SWF*)gfx->internal; if(!strcmp(name, "swf")) { @@ -1364,15 +1410,15 @@ static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth) static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover); static void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points); static void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points); -static void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points); +static void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points); -void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points) +/*void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; dev->drawlink(dev, points, url); -} +}*/ -void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) +void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, const char*url) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1390,7 +1436,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) if(url[t]<'0' || url[t]>'9') nodigit = 1; if(!nodigit) { - int page = atoi(&url[4]) - 1; + int page = atoi(&url[4]); if(page<0) page = 0; swfoutput_linktopage(dev, page, points); } @@ -1398,7 +1444,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) swfoutput_linktourl(dev, url, points); } } -void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points) +void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points) { ActionTAG* actions = 0; swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1435,7 +1481,7 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) endtext(dev); if(!i->config_internallinkfunction) { - actions = action_GotoFrame(actions, page); + actions = action_GotoFrame(actions, page-1); actions = action_End(actions); } else { actions = action_PushInt(actions, page); //parameter @@ -1507,24 +1553,23 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line) swfoutput_internal*i = (swfoutput_internal*)dev->internal; gfxcoord_t lastx=0,lasty=0,px=0,py=0; char lastwasmoveto; + int lines= 0, splines=0; while(1) { if(!line) break; /* check whether the next segment is zero */ if(line->type == gfx_moveTo) { - msg(" ======== moveTo %.2f %.2f", line->x, line->y); moveto(dev, i->tag, line->x, line->y); px = lastx = line->x; py = lasty = line->y; lastwasmoveto = 1; } if(line->type == gfx_lineTo) { - msg(" ======== lineTo %.2f %.2f", line->x, line->y); lineto(dev, i->tag, line->x, line->y); px = line->x; py = line->y; lastwasmoveto = 0; + lines++; } else if(line->type == gfx_splineTo) { - msg(" ======== splineTo %.2f %.2f", line->x, line->y); plotxy_t s,p; s.x = line->sx;p.x = line->x; s.y = line->sy;p.y = line->y; @@ -1532,9 +1577,11 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line) px = line->x; py = line->y; lastwasmoveto = 0; + splines++; } line = line->next; } + msg(" drawgfxline, %d lines, %d splines", lines, splines); } @@ -1632,6 +1679,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf } } + msg(" Placing link ID %d", buttonid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); if(posx!=0 || posy!=0) { @@ -1696,6 +1744,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + msg(" swfdevice: %s=%s", name, value); if(!strcmp(name, "jpegsubpixels")) { i->config_jpegsubpixels = atof(value); } else if(!strcmp(name, "ppmsubpixels")) { @@ -1727,12 +1776,21 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_enablezlib = atoi(value); } else if(!strcmp(name, "bboxvars")) { i->config_bboxvars = atoi(value); + } else if(!strcmp(name, "showclipshapes")) { + i->config_showclipshapes = atoi(value); + } else if(!strcmp(name, "reordertags")) { + i->config_reordertags = atoi(value); } else if(!strcmp(name, "internallinkfunction")) { i->config_internallinkfunction = strdup(value); } else if(!strcmp(name, "externallinkfunction")) { i->config_externallinkfunction = strdup(value); + } else if(!strcmp(name, "linkfunction")) { //sets both internallinkfunction and externallinkfunction + i->config_internallinkfunction = strdup(value); + i->config_externallinkfunction = strdup(value); } else if(!strcmp(name, "disable_polygon_conversion")) { i->config_disable_polygon_conversion = atoi(value); + } else if(!strcmp(name, "normalize_polygon_positions")) { + i->config_normalize_polygon_positions = atoi(value); } else if(!strcmp(name, "insertstop")) { i->config_insertstoptag = atoi(value); } else if(!strcmp(name, "protect")) { @@ -1747,6 +1805,11 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) if(i->swf) { i->swf->fileVersion = i->config_flashversion; } + } else if(!strcmp(name, "framerate")) { + i->config_framerate = atoi(value); + if(i->swf) { + i->swf->frameRate = i->config_framerate*0x100; + } } else if(!strcmp(name, "minlinewidth")) { i->config_minlinewidth = atof(value); } else if(!strcmp(name, "caplinewidth")) { @@ -1755,12 +1818,14 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linktarget = strdup(value); } else if(!strcmp(name, "dumpfonts")) { i->config_dumpfonts = atoi(value); + } else if(!strcmp(name, "animate")) { + i->config_animate = atoi(value); } else if(!strcmp(name, "next_bitmap_is_jpeg")) { i->jpeg = 1; } else if(!strcmp(name, "jpegquality")) { int val = atoi(value); if(val<0) val=0; - if(val>100) val=100; + if(val>101) val=101; i->config_jpegquality = val; } else if(!strcmp(name, "splinequality")) { int v = atoi(value); @@ -1789,7 +1854,6 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linkcolor.a); } else { - fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); return 0; } return 1; @@ -1813,136 +1877,13 @@ static CXFORM gfxcxform_to_cxform(gfxcxform_t* c) cx.r0 = (S16)(c->rr*256); cx.g0 = (S16)(c->gg*256); cx.b0 = (S16)(c->bb*256); - cx.a1 = c->t.a; - cx.r1 = c->t.r; - cx.g1 = c->t.g; - cx.b1 = c->t.b; + cx.a1 = c->ta; + cx.r1 = c->tr; + cx.g1 = c->tg; + cx.b1 = c->tb; return cx; } -static ArtVpath* gfxline_to_ArtVpath(gfxline_t*line) -{ - ArtVpath *vec = NULL; - int pos=0,len=0; - gfxline_t*l2; - double x=0,y=0; - - /* factor which determines into how many line fragments a spline is converted */ - double subfraction = 2.4;//0.3 - - l2 = line; - while(l2) { - if(l2->type == gfx_moveTo) { - pos ++; - } if(l2->type == gfx_lineTo) { - pos ++; - } if(l2->type == gfx_splineTo) { - int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction); - if(!parts) parts = 1; - pos += parts + 1; - } - x = l2->x; - y = l2->y; - l2 = l2->next; - } - pos++; - len = pos; - - vec = art_new (ArtVpath, len); - - pos = 0; - l2 = line; - while(l2) { - if(l2->type == gfx_moveTo) { - vec[pos].code = ART_MOVETO; - vec[pos].x = l2->x; - vec[pos].y = l2->y; - pos++; - assert(pos<=len); - } else if(l2->type == gfx_lineTo) { - vec[pos].code = ART_LINETO; - vec[pos].x = l2->x; - vec[pos].y = l2->y; - pos++; - assert(pos<=len); - } else if(l2->type == gfx_splineTo) { - int i; - int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction); - if(!parts) parts = 1; - for(i=0;i<=parts;i++) { - double t = (double)i/(double)parts; - vec[pos].code = ART_LINETO; - vec[pos].x = l2->x*t*t + 2*l2->sx*t*(1-t) + x*(1-t)*(1-t); - vec[pos].y = l2->y*t*t + 2*l2->sy*t*(1-t) + y*(1-t)*(1-t); - pos++; - assert(pos<=len); - } - } - x = l2->x; - y = l2->y; - l2 = l2->next; - } - vec[pos].code = ART_END; - - return vec; -} - -static ArtSVP* gfxfillToSVP(gfxline_t*line) -{ - ArtVpath* vec = gfxline_to_ArtVpath(line); - ArtSVP *svp = art_svp_from_vpath(vec); - free(vec); - return svp; -} - -static ArtSVP* gfxstrokeToSVP(gfxline_t*line, gfxcoord_t width, gfx_capType cap_style, gfx_joinType joint_style, double miterLimit) -{ - ArtVpath* vec = gfxline_to_ArtVpath(line); - ArtSVP *svp = art_svp_vpath_stroke (vec, - (joint_style==gfx_joinMiter)?ART_PATH_STROKE_JOIN_MITER: - ((joint_style==gfx_joinRound)?ART_PATH_STROKE_JOIN_ROUND: - ((joint_style==gfx_joinBevel)?ART_PATH_STROKE_JOIN_BEVEL:ART_PATH_STROKE_JOIN_BEVEL)), - (cap_style==gfx_capButt)?ART_PATH_STROKE_CAP_BUTT: - ((cap_style==gfx_capRound)?ART_PATH_STROKE_CAP_ROUND: - ((cap_style==gfx_capSquare)?ART_PATH_STROKE_CAP_SQUARE:ART_PATH_STROKE_CAP_SQUARE)), - width, //line_width - miterLimit, //miter_limit - 0.05 //flatness - ); - free(vec); - return svp; -} - -static gfxline_t* SVPtogfxline(ArtSVP*svp) -{ - int size = 0; - int t; - int pos = 0; - for(t=0;tn_segs;t++) { - size += svp->segs[t].n_points + 1; - } - gfxline_t* lines = (gfxline_t*)rfx_alloc(sizeof(gfxline_t)*size); - - for(t=0;tn_segs;t++) { - ArtSVPSeg* seg = &svp->segs[t]; - int p; - for(p=0;pn_points;p++) { - lines[pos].type = p==0?gfx_moveTo:gfx_lineTo; - ArtPoint* point = &seg->points[p]; - lines[pos].x = point->x; - lines[pos].y = point->y; - lines[pos].next = &lines[pos+1]; - pos++; - } - } - if(pos) { - lines[pos-1].next = 0; - return lines; - } else { - return 0; - } -} - /* TODO */ static int imageInCache(gfxdevice_t*dev, void*data, int width, int height) { @@ -1967,16 +1908,20 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int /// { if(is_jpeg && i->config_jpegsubpixels) { - newsizex = (int)(targetwidth*i->config_jpegsubpixels+0.5); - newsizey = (int)(targetheight*i->config_jpegsubpixels+0.5); + newsizex = (int)(targetwidth*i->config_jpegsubpixels + 0.5); + newsizey = (int)(targetheight*i->config_jpegsubpixels + 0.5); } else if(!is_jpeg && i->config_ppmsubpixels) { - newsizex = (int)(targetwidth*i->config_ppmsubpixels+0.5); - newsizey = (int)(targetheight*i->config_ppmsubpixels+0.5); + newsizex = (int)(targetwidth*i->config_ppmsubpixels + 0.5); + newsizey = (int)(targetheight*i->config_ppmsubpixels + 0.5); } /// } - if(sizex<=0 || sizey<=0 || newsizex<=0 || newsizey<=0) + if(sizex<=0 || sizey<=0) return -1; + if(newsizex<=0) + newsizex = 1; + if(newsizey<=0) + newsizey = 1; /* TODO: cache images */ @@ -1994,10 +1939,10 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0); int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey); - msg(" Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors", + msg(" Drawing %dx%d %s%simage (id %d) at size %dx%d (%dx%d), %s%d colors", sizex, sizey, has_alpha?(has_alpha==2?"semi-transparent ":"transparent "):"", - is_jpeg?"jpeg-":"", + is_jpeg?"jpeg-":"", i->currentswfid+1, newsizex, newsizey, targetwidth, targetheight, /*newsizex, newsizey,*/ @@ -2041,9 +1986,22 @@ static SRECT gfxline_getSWFbbox(gfxline_t*line) return r; } +int line_is_empty(gfxline_t*line) +{ + while(line) { + if(line->type != gfx_moveTo) + return 0; + line = line->next; + } + return 1; +} + static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + if(line_is_empty(line)) + return; endshape(dev); endtext(dev); @@ -2084,11 +2042,40 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); + msg(" Placing bitmap ID %d", myshapeid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); CXFORM cxform2 = gfxcxform_to_cxform(cxform); swf_ObjectPlace(i->tag,myshapeid,getNewDepth(dev),&i->page_matrix,&cxform2,NULL); } +static RGBA col_black = {255,0,0,0}; + +static void drawoutline(gfxdevice_t*dev, gfxline_t*line) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + int myshapeid = getNewID(dev); + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); + + SHAPE*shape; + swf_ShapeNew(&shape); + int lsid = swf_ShapeAddLineStyle(shape,1,&col_black); + + swf_SetU16(i->tag,myshapeid); + SRECT r = gfxline_getSWFbbox(line); + swf_SetRect(i->tag,&r); + swf_SetShapeStyles(i->tag,shape); + swf_ShapeCountBits(shape,NULL,NULL); + swf_SetShapeBits(i->tag,shape); + swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,lsid,0,0); + drawgfxline(dev, line); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(shape); + + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag, myshapeid, getNewDepth(dev), 0,0,0); +} + static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -2102,10 +2089,14 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) i->clippos --; } + if(i->config_showclipshapes) + drawoutline(dev, line); + int myshapeid = getNewID(dev); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); RGBA col; memset(&col, 0, sizeof(RGBA)); + col.a = 255; SHAPE*shape; swf_ShapeNew(&shape); int fsid = swf_ShapeAddSolidFillStyle(shape,&col); @@ -2121,12 +2112,22 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) swf_SetShapeBits(i->tag,shape); swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); i->swflastx = i->swflasty = UNDEFINED_COORD; + i->shapeisempty = 1; drawgfxline(dev, line); + if(i->shapeisempty) { + /* an empty clip shape is equivalent to a shape with no area */ + int x = line?line->x:0; + int y = line?line->y:0; + moveto(dev, i->tag, x,y); + lineto(dev, i->tag, x,y); + lineto(dev, i->tag, x,y); + } swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); /* TODO: remember the bbox, and check all shapes against it */ + msg(" Placing clip ID %d", myshapeid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); i->cliptags[i->clippos] = i->tag; i->clipshapes[i->clippos] = myshapeid; @@ -2159,6 +2160,7 @@ static int gfxline_type(gfxline_t*line) int lines=0; int splines=0; int haszerosegments=0; + int length=0; while(line) { if(line->type == gfx_moveTo) { tmplines=0; @@ -2172,8 +2174,11 @@ static int gfxline_type(gfxline_t*line) if(tmpsplines>lines) splines=tmpsplines; } + length++; line = line->next; } + if(length>400) + return 5; if(lines==0 && splines==0) return 0; else if(lines==1 && splines==0) return 1; else if(lines==0 && splines==1) return 2; @@ -2253,24 +2258,6 @@ static char is_inside_page(gfxdevice_t*dev, gfxcoord_t x, gfxcoord_t y) return 1; } -static void show_path(ArtSVP*path) -{ - int t; - printf("Segments: %d\n", path->n_segs); - for(t=0;tn_segs;t++) { - ArtSVPSeg* seg = &path->segs[t]; - printf("Segment %d: %d points, %s, BBox: (%f,%f,%f,%f)\n", - t, seg->n_points, seg->dir==0?"UP ":"DOWN", - seg->bbox.x0, seg->bbox.y0, seg->bbox.x1, seg->bbox.y1); - int p; - for(p=0;pn_points;p++) { - ArtPoint* point = &seg->points[p]; - printf(" (%f,%f)\n", point->x, point->y); - } - } - printf("\n"); -} - gfxline_t* gfxline_move(gfxline_t*line, double x, double y) { gfxline_t*l = line = gfxline_clone(line); @@ -2290,6 +2277,8 @@ gfxline_t* gfxline_move(gfxline_t*line, double x, double y) static 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; + if(line_is_empty(line)) + return; int type = gfxline_type(line); int has_dots = gfxline_has_dots(line); gfxbbox_t r = gfxline_getbbox(line); @@ -2297,7 +2286,7 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol /* TODO: * split line into segments, and perform this check for all segments */ - if(i->config_disable_polygon_conversion || + if(i->config_disable_polygon_conversion || type>=5 || (!has_dots && (width <= i->config_caplinewidth || (cap_style == gfx_capRound && joint_style == gfx_joinRound) @@ -2319,17 +2308,17 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol msg(" draw as stroke, type=%d dots=%d", type, has_dots); endtext(dev); -#ifdef NORMALIZE_POLYGON_POSITIONS - endshape(dev); - double startx = 0, starty = 0; - if(line && line->type == gfx_moveTo) { - startx = line->x; - starty = line->y; - } - line = gfxline_move(line, -startx, -starty); - i->shapeposx = (int)(startx*20); - i->shapeposy = (int)(starty*20); -#endif + if(i->config_normalize_polygon_positions) { + endshape(dev); + double startx = 0, starty = 0; + if(line && line->type == gfx_moveTo) { + startx = line->x; + starty = line->y; + } + line = gfxline_move(line, -startx, -starty); + i->shapeposx = (int)(startx*20); + i->shapeposy = (int)(starty*20); + } swfoutput_setstrokecolor(dev, color->r, color->g, color->b, color->a); swfoutput_setlinewidth(dev, width); @@ -2337,32 +2326,38 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol stopFill(dev); drawgfxline(dev, line); -#ifdef NORMALIZE_POLYGON_POSITIONS - free(line); //account for _move -#endif + if(i->config_normalize_polygon_positions) { + free(line); //account for _move + } } static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(line_is_empty(line)) + return; + if(!color->a) + return; gfxbbox_t r = gfxline_getbbox(line); int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax); + //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) { endtext(dev); + if(!i->config_ignoredraworder) endshape(dev); -#ifdef NORMALIZE_POLYGON_POSITIONS - endshape(dev); - double startx = 0, starty = 0; - if(line && line->type == gfx_moveTo) { - startx = line->x; - starty = line->y; - } - line = gfxline_move(line, -startx, -starty); - i->shapeposx = (int)(startx*20); - i->shapeposy = (int)(starty*20); -#endif + if(i->config_normalize_polygon_positions) { + endshape(dev); + double startx = 0, starty = 0; + if(line && line->type == gfx_moveTo) { + startx = line->x; + starty = line->y; + } + line = gfxline_move(line, -startx, -starty); + i->shapeposx = (int)(startx*20); + i->shapeposy = (int)(starty*20); + } swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a); startshape(dev); @@ -2371,16 +2366,18 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) drawgfxline(dev, line); msg(" end of swf_fill (shapeid=%d)", i->shapeid); -#ifdef NORMALIZE_POLYGON_POSITIONS - free(line); //account for _move -#endif + if(i->config_normalize_polygon_positions) { + free(line); //account for _move + } } static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix) { + if(line_is_empty(line)) + return; msg(" Gradient filling not implemented yet"); } -static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) +static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) { SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT)); int t; @@ -2408,6 +2405,13 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) gfxline_t*line; int advance = 0; swffont->glyph2ascii[t] = font->glyphs[t].unicode; + if(swffont->glyph2ascii[t] == 0xffff || swffont->glyph2ascii[t] == 0x0000) { + /* flash 8 flashtype requires unique unicode IDs for each character. + We use the Unicode private user area to assign characters, hoping that + the font doesn't contain more than 2048 glyphs */ + swffont->glyph2ascii[t] = 0xe000 + (t&0x1fff); + } + if(font->glyphs[t].name) { swffont->glyphnames[t] = strdup(font->glyphs[t].name); } else { @@ -2419,8 +2423,8 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) line = font->glyphs[t].line; while(line) { FPOINT c,to; - c.x = line->sx; c.y = line->sy; - to.x = line->x; to.y = line->y; + c.x = line->sx * GLYPH_SCALE; c.y = line->sy * GLYPH_SCALE; + to.x = line->x * GLYPH_SCALE; to.y = line->y * GLYPH_SCALE; if(line->type == gfx_moveTo) { draw.moveTo(&draw, &to); } else if(line->type == gfx_lineTo) { @@ -2462,23 +2466,23 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) return swffont; } -static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font) +static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,fontid)) + if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,font->id)) return; // the requested font is the current font fontlist_t*last=0,*l = i->fontlist; while(l) { last = l; - if(!strcmp((char*)l->swffont->name, fontid)) { + if(!strcmp((char*)l->swffont->name, font->id)) { return; // we already know this font } l = l->next; } l = (fontlist_t*)rfx_calloc(sizeof(fontlist_t)); - l->swffont = gfxfont_to_swffont(font, fontid); + l->swffont = gfxfont_to_swffont(font, font->id); l->next = 0; if(last) { last->next = l; @@ -2490,7 +2494,7 @@ static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font) if(getScreenLogLevel() >= LOGLEVEL_DEBUG) { int iii; // print font information - msg(" Font %s",fontid); + msg(" Font %s",font->id); msg(" | ID: %d", l->swffont->id); msg(" | Version: %d", l->swffont->version); msg(" | Name: %s", l->swffont->name); @@ -2514,7 +2518,7 @@ static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font) } } -static void swf_switchfont(gfxdevice_t*dev, char*fontid) +static void swf_switchfont(gfxdevice_t*dev, const char*fontid) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -2533,28 +2537,22 @@ static void swf_switchfont(gfxdevice_t*dev, char*fontid) return; } -static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix) +static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(!font) + return; - if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,fontid)) // not equal to current font + if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font { /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope with multiple fonts */ endtext(dev); - swf_switchfont(dev, fontid); // set the current font + swf_switchfont(dev, font->id); // set the current font } - swfoutput_setfontmatrix(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11); - - swfmatrix_t m; - m.m11 = i->fontm11; - m.m12 = i->fontm12; - m.m21 = i->fontm21; - m.m22 = i->fontm22; - m.m31 = matrix->tx; - m.m32 = matrix->ty; - + setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11); + /* printf("%f %f\n", m.m31, m.m32); { static int xpos = 40; @@ -2565,5 +2563,5 @@ static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*col }*/ - drawchar(dev, i->swffont, glyph, &m, color); + drawchar(dev, i->swffont, glyph, matrix->tx, matrix->ty, color); }