X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=8cbfec0d51bd0c5f9b751327f1387806f81d09af;hb=619c598195de4fc32af95d6b6608ba00f91b5dfc;hp=d349bda06ecfe0ec01e40d1713910ab5a9efde30;hpb=6c7511ba5b193b52ae55a76727f093842681aa3b;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index d349bda..8cbfec0 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -23,19 +23,26 @@ #include #include "../../config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_IO_H +#include +#endif #ifdef HAVE_ASSERT_H #include #else #define assert(a) #endif #include +#include "../mem.h" #include "../log.h" #include "../rfxswf.h" #include "../gfxdevice.h" #include "../gfxtools.h" #include "../art/libart.h" -#include "artsutils.c" +#include "swf.h" +#include "artsutils.h" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -74,22 +81,26 @@ typedef struct _swfoutput_internal int config_drawonlyshapes; int config_jpegquality; int config_storeallcharacters; - int config_generate_fake_tags; 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; @@ -148,8 +159,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; @@ -173,7 +185,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm 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, 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, char*action); +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); @@ -221,19 +233,21 @@ static swfoutput_internal* init_internal_struct() i->config_jpegquality=85; i->config_storeallcharacters=0; i->config_enablezlib=0; - 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; @@ -673,10 +687,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) { @@ -685,7 +699,7 @@ static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix_t*m } if(charid<0 || charid>=swffont->numchars) { - msg(" No character %d in font %s ", charid, FIXNULL((char*)swffont->name)); + msg(" No character %d in font %s (%d chars)", charid, FIXNULL((char*)swffont->name), swffont->numchars); return 0; } /*if(swffont->glyph[charid].shape->bitlen <= 16) { @@ -699,21 +713,25 @@ 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); + + msg(" Drawing char %d in font %d at %d,%d in color %02x%02x%02x%02x", + charid, swffont->id, p.x,p.y, rgba.r, rgba.g, rgba.b, rgba.a); + + putcharacter(dev, swffont->id, charid,p.x,p.y,i->current_font_size, rgba); swf_FontUseGlyph(swffont, charid); return 1; } @@ -724,7 +742,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; @@ -738,36 +756,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; @@ -824,7 +862,7 @@ void swf_endframe(gfxdevice_t*dev) if(!i->pagefinished) endpage(dev); - if(i->config_insertstoptag) { + if( (i->swf->fileVersion <= 8) && (i->config_insertstoptag) ) { ActionTAG*atag=0; atag = action_Stop(atag); atag = action_End(atag); @@ -877,6 +915,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; @@ -897,7 +938,6 @@ void gfxdevice_swf_init(gfxdevice_t* dev) swfoutput_internal*i = (swfoutput_internal*)dev->internal; i->dev = dev; - SRECT r; RGBA rgb; msg(" initializing swf output\n", i->max_x,i->max_y); @@ -906,7 +946,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; @@ -930,9 +970,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); @@ -1106,7 +1145,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; @@ -1114,6 +1153,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; @@ -1139,7 +1182,6 @@ void wipeSWF(SWF*swf) } } - void swfoutput_finalize(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1181,7 +1223,7 @@ void swfoutput_finalize(gfxdevice_t*dev) } endpage(dev); - fontlist_t *tmp,*iterator = i->fontlist; + fontlist_t *iterator = i->fontlist; while(iterator) { TAG*mtag = i->swf->firstTag; if(iterator->swffont) { @@ -1190,7 +1232,7 @@ void swfoutput_finalize(gfxdevice_t*dev) swf_FontReduce(iterator->swffont); } int used = iterator->swffont->use && iterator->swffont->use->used_glyphs; - if(i->config_storeallcharacters || used) { + if(used) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); swf_FontSetDefine2(mtag, iterator->swffont); } @@ -1215,9 +1257,16 @@ void swfoutput_finalize(gfxdevice_t*dev) if(i->config_enablezlib || i->config_flashversion>=6) { i->swf->compressed = 1; } + + /* Initialize AVM2 if it is a Flash9 file */ + if(i->config_flashversion>=9 && i->config_insertstoptag) { + AVM2_InsertStops(i->swf); + } +// 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; @@ -1231,19 +1280,14 @@ int swfresult_save(gfxresult_t*gfx, char*filename) return -1; } - if(swf->compressed) { - if FAILED(swf_WriteSWC(fi,swf)) - msg(" WriteSWC() failed.\n"); - } else { - if FAILED(swf_WriteSWF(fi,swf)) - msg(" WriteSWF() failed.\n"); - } + if FAILED(swf_WriteSWF(fi,swf)) + msg(" WriteSWF() failed.\n"); if(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")) { @@ -1372,15 +1416,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; @@ -1406,7 +1450,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; @@ -1554,12 +1598,10 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf SRECT r; int lsid=0; int fsid; - plotxy_t p1,p2,p3,p4; int myshapeid; int myshapeid2; double posx = 0; double posy = 0; - int t; int buttonid = getNewID(dev); gfxbbox_t bbox = gfxline_getbbox(points); @@ -1641,6 +1683,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) { @@ -1737,12 +1780,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")) { @@ -1750,13 +1802,16 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) if(i->config_protect && i->tag) { i->tag = swf_InsertTag(i->tag, ST_PROTECT); } - } else if(!strcmp(name, "faketags")) { - i->config_generate_fake_tags = atoi(value); } else if(!strcmp(name, "flashversion")) { i->config_flashversion = atoi(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")) { @@ -1765,12 +1820,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); @@ -1798,8 +1855,33 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linkcolor.b, i->config_linkcolor.a); + } else if(!strcmp(name, "help")) { + printf("\nSWF layer options:\n"); + printf("jpegdpi= resolution adjustment for jpeg images\n"); + printf("jpegsubpixels= resolution adjustment for jpeg images (same as jpegdpi, but in pixels)\n"); + printf("ppmdpi= resolution adjustment for lossless images\n"); + printf("ppmsubpixels= shortcut for setting both jpegsubpixels and ppmsubpixels\n"); + printf("drawonlyshapes convert everything to shapes (currently broken)\n"); + printf("ignoredraworder allow to perform a few optimizations for creating smaller SWFs\n"); + printf("linksopennewwindow make links open a new browser window\n"); + printf("linktarget target window name of new links\n"); + printf("linkcolor==7)\n"); + printf("bboxvars store the bounding box of the SWF file in actionscript variables\n"); + printf("reordertags=0/1 (default: 1) perform some tag optimizations\n"); + printf("internallinkfunction= when the user clicks a internal link (to a different page) in the converted file, this actionscript function is called\n"); + printf("externallinkfunction= when the user clicks an external link (e.g. http://www.foo.bar/) on the converted file, this actionscript function is called\n"); + printf("disable_polygon_conversion never convert strokes to polygons (will remove capstyles and joint styles)\n"); + printf("caplinewidth= the minimum thichness a line needs to have so that capstyles become visible (and are converted)\n"); + printf("insertstop put an ActionScript \"STOP\" tag in every frame\n"); + printf("protect add a \"protect\" tag to the file, to prevent loading in the Flash editor\n"); + printf("flashversion= the SWF fileversion (6)\n"); + printf("minlinewidth= convert horizontal/vertical boxes smaller than this width to lines (0.05) \n"); + printf("animate insert a showframe tag after each placeobject (animate draw order of PDF files)\n"); + printf("jpegquality= set compression quality of jpeg images\n"); } else { - fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); return 0; } return 1; @@ -1823,10 +1905,10 @@ 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; } @@ -1854,16 +1936,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 */ @@ -1881,10 +1967,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,*/ @@ -1959,8 +2045,6 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm double fy = (double)img->height / (double)newheight; MATRIX m; - float m00,m10,tx; - float m01,m11,ty; m.sx = (int)(65536*20*matrix->m00*fx); m.r1 = (int)(65536*20*matrix->m10*fy); m.r0 = (int)(65536*20*matrix->m01*fx); m.sy = (int)(65536*20*matrix->m11*fy); m.tx = (int)(matrix->tx*20); @@ -1984,11 +2068,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; @@ -2002,10 +2115,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); @@ -2021,12 +2138,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; @@ -2207,17 +2334,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); @@ -2225,9 +2352,9 @@ 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) @@ -2240,21 +2367,23 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) 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); @@ -2263,9 +2392,9 @@ 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) { @@ -2274,7 +2403,7 @@ static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*grad 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; @@ -2302,6 +2431,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 { @@ -2313,8 +2449,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) { @@ -2328,13 +2464,14 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw); swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw); - if(swffont->layout->bounds[t].xmax && swffont->layout->bounds[t].xmax*2 < advance) { - printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", swffont->layout->bounds[t].xmax, advance, font->glyphs[t].advance); - advance = swffont->layout->bounds[t].xmax; + int xmax = swffont->layout->bounds[t].xmax / 20; + if(xmax>0 && xmax*2 < advance) { + printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", xmax, advance, font->glyphs[t].advance); + advance = xmax; } - if(advance<32768) { - swffont->glyph[t].advance = advance; + if(advance<32768/20) { + swffont->glyph[t].advance = advance*20; } else { swffont->glyph[t].advance = 32767; } @@ -2352,6 +2489,9 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) swffont->layout->descent = (bounds.ymax - bounds.ymin)/2; swffont->layout->leading = bounds.ymax - bounds.ymin; } + swffont->layout->descent= (bounds.ymax - bounds.ymin); + swffont->layout->ascent = 0; + swffont->layout->leading = bounds.ymax - bounds.ymin; return swffont; } @@ -2408,7 +2548,7 @@ static void swf_addfont(gfxdevice_t*dev, 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; @@ -2430,6 +2570,10 @@ static void swf_switchfont(gfxdevice_t*dev, char*fontid) 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) { + msg(" swf_drawchar called (glyph %d) without font", glyph); + return; + } if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font { @@ -2439,16 +2583,8 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* 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; @@ -2459,5 +2595,5 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* }*/ - drawchar(dev, i->swffont, glyph, &m, color); + drawchar(dev, i->swffont, glyph, matrix->tx, matrix->ty, color); }