X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=a47e5c4e56ddf7fc877285477eecbf9e8864a2a0;hb=3976bb67e34fe25dd05f0e6d9e5a405e5782c400;hp=d0ac1c4ea778bf077c205aa8f4a4d56ce7437e9d;hpb=c358b937eb472e15c207783d33e97ccf8b47fb4e;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index d0ac1c4..a47e5c4 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,7 +81,6 @@ 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; @@ -227,7 +233,6 @@ 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; @@ -684,49 +689,6 @@ static void putcharacter(gfxdevice_t*dev, int fontid, int charid, int x,int y, i If we set it to low, however, the char positions will be inaccurate */ #define GLYPH_SCALE 1 -/* process a character. */ -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) { - msg(" Font is NULL"); - return 0; - } - - if(charid<0 || charid>=swffont->numchars) { - 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) { - msg(" Glyph %d in current charset (%s, %d characters) is empty", - charid, FIXNULL((char*)swffont->name), swffont->numchars); - return 1; - }*/ - - if(i->shapeid>=0) - endshape(dev); - if(i->textid<0) - starttext(dev); - - 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 * GLYPH_SCALE / det; - - SPOINT p; - 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,i->current_font_size, rgba); - swf_FontUseGlyph(swffont, charid); - return 1; -} - static void endtext(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -767,7 +729,7 @@ static void endtext(gfxdevice_t*dev) } /* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */ -static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,double m22) +static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,double m22,double x, double y, char force) { m11 *= 1024; m12 *= 1024; @@ -777,7 +739,7 @@ static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,doubl if(i->lastfontm11 == m11 && i->lastfontm12 == m12 && i->lastfontm21 == m21 && - i->lastfontm22 == m22) + i->lastfontm22 == m22 && !force) return; if(i->textid>=0) endtext(dev); @@ -797,8 +759,11 @@ static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,doubl MATRIX m; 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; + /* this is the position of the first char to set a new fontmatrix- + we hope that it's close enough to all other characters using the + font, so we use its position as origin for the matrix */ + m.tx = x*20; + m.ty = y*20; i->fontmatrix = m; } @@ -853,7 +818,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); @@ -929,7 +894,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); @@ -1174,7 +1138,6 @@ void wipeSWF(SWF*swf) } } - void swfoutput_finalize(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1216,7 +1179,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) { @@ -1251,6 +1214,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); } @@ -1269,13 +1236,8 @@ int swfresult_save(gfxresult_t*gfx, const 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); @@ -1592,12 +1554,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); @@ -1798,8 +1758,6 @@ 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) { @@ -2043,8 +2001,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); @@ -2470,8 +2426,8 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) 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; } @@ -2489,6 +2445,9 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const 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; } @@ -2567,28 +2526,65 @@ static void swf_switchfont(gfxdevice_t*dev, const 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) + 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 { /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope with multiple fonts */ endtext(dev); - swf_switchfont(dev, font->id); // set the current font } - setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11); + if(!i->swffont) { + msg(" Font is NULL"); + return; + } + if(glyph<0 || glyph>=i->swffont->numchars) { + msg(" No character %d in font %s (%d chars)", glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars); + return; + } + + setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 0); + + 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 */ + msg(" Not drawing invisible character character %d (det=%f, m=[%f %f;%f %f]\n", glyph, + i->fontmatrix.sx/65536.0, i->fontmatrix.r1/65536.0, + i->fontmatrix.r0/65536.0, i->fontmatrix.sy/65536.0); + return; + } -/* printf("%f %f\n", m.m31, m.m32); - { - static int xpos = 40; - static int ypos = 200; - m.m31 = xpos; - m.m32 = ypos; - xpos += 10; + /*if(i->swffont->glyph[glyph].shape->bitlen <= 16) { + msg(" Glyph %d in current charset (%s, %d characters) is empty", + glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars); + return 1; }*/ + /* calculate character position with respect to the current font matrix */ + double s = 20 * GLYPH_SCALE / det; + double px = matrix->tx - i->fontmatrix.tx/20.0; + double py = matrix->ty - i->fontmatrix.ty/20.0; + int x = (SCOORD)(( px * i->fontmatrix.sy/65536.0 - py * i->fontmatrix.r1/65536.0)*s); + int y = (SCOORD)((- px * i->fontmatrix.r0/65536.0 + py * i->fontmatrix.sx/65536.0)*s); + if(x>32767 || x<-32768 || y>32767 || y<-32768) { + msg(" Moving character origin to %f %f\n", matrix->tx, matrix->ty); + endtext(dev); + setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 1); + } + + if(i->shapeid>=0) + endshape(dev); + if(i->textid<0) + starttext(dev); + + msg(" Drawing char %d in font %d at %d,%d in color %02x%02x%02x%02x", + glyph, i->swffont->id, x, y, color->r, color->g, color->b, color->a); - drawchar(dev, i->swffont, glyph, matrix->tx, matrix->ty, color); + putcharacter(dev, i->swffont->id, glyph, x, y, i->current_font_size, *(RGBA*)color); + swf_FontUseGlyph(i->swffont, glyph); + return; }