X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=872d0a947c1279d432653de8b135e9057d066364;hb=30b68dc4d9d219f77e73bbd1db59dd41fd27d1eb;hp=fb2c341beda024fcc83cf0d51b55b46eaa443140;hpb=8acfd5822a6d49baef2a94f9dd8f4b1ecbdc49be;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index fb2c341..872d0a9 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -79,6 +79,7 @@ typedef struct _swfoutput_internal int config_insertstoptag; int config_flashversion; int config_reordertags; + int config_showclipshapes; int config_splinemaxerror; int config_fontsplinemaxerror; int config_filloverlap; @@ -235,6 +236,7 @@ static swfoutput_internal* init_internal_struct() 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; @@ -692,7 +694,7 @@ static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, float x, floa } 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) { @@ -731,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; @@ -851,7 +853,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); @@ -960,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); @@ -1173,7 +1174,6 @@ void wipeSWF(SWF*swf) } } - void swfoutput_finalize(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1224,7 +1224,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); } @@ -1250,6 +1250,10 @@ void swfoutput_finalize(gfxdevice_t*dev) 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); } @@ -1775,6 +1779,8 @@ 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")) { @@ -1850,6 +1856,32 @@ 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 { return 0; } @@ -2045,6 +2077,34 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm 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; @@ -2058,6 +2118,9 @@ 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; @@ -2082,9 +2145,11 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) drawgfxline(dev, line); if(i->shapeisempty) { /* an empty clip shape is equivalent to a shape with no area */ - moveto(dev, i->tag, line->x, line->y); - lineto(dev, i->tag, line->x, line->y); - lineto(dev, i->tag, line->x, line->y); + 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); @@ -2305,7 +2370,9 @@ 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); @@ -2400,9 +2467,10 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const 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) {