#include <string.h>
#include "../../config.h"
#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
#ifdef HAVE_ASSERT_H
#include <assert.h>
#else
#define assert(a)
#endif
#include <math.h>
+#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
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_internallinkfunction;
char*config_externallinkfunction;
char config_animate;
+ double config_framerate;
SWF* swf;
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);
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;
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("<warning> Font is NULL");
- return 0;
- }
-
- if(charid<0 || charid>=swffont->numchars) {
- msg("<warning> No character %d in font %s ", charid, FIXNULL((char*)swffont->name));
- return 0;
- }
- /*if(swffont->glyph[charid].shape->bitlen <= 16) {
- msg("<warning> 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;
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;
}
/* 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;
if(i->lastfontm11 == m11 &&
i->lastfontm12 == m12 &&
i->lastfontm21 == m21 &&
- i->lastfontm22 == m22)
+ i->lastfontm22 == m22 && !force)
return;
if(i->textid>=0)
endtext(dev);
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;
}
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);
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
i->dev = dev;
- SRECT r;
RGBA rgb;
msg("<verbose> initializing swf output\n", i->max_x,i->max_y);
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;
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);
}
}
-
void swfoutput_finalize(gfxdevice_t*dev)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
}
endpage(dev);
- fontlist_t *tmp,*iterator = i->fontlist;
+ fontlist_t *iterator = i->fontlist;
while(iterator) {
TAG*mtag = i->swf->firstTag;
if(iterator->swffont) {
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);
}
i->swf->compressed = 1;
}
- if(i->config_reordertags)
- swf_Optimize(i->swf);
+ /* 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;
return -1;
}
- if(swf->compressed) {
- if FAILED(swf_WriteSWC(fi,swf))
- msg("<error> WriteSWC() failed.\n");
- } else {
- if FAILED(swf_WriteSWF(fi,swf))
- msg("<error> WriteSWF() failed.\n");
- }
+ if FAILED(swf_WriteSWF(fi,swf))
+ msg("<error> 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")) {
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;
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;
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);
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")) {
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")) {
} 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);
i->config_linkcolor.b,
i->config_linkcolor.a);
+ } else if(!strcmp(name, "help")) {
+ printf("\nSWF layer options:\n");
+ printf("jpegdpi=<dpi> resolution adjustment for jpeg images\n");
+ printf("jpegsubpixels=<pixels> resolution adjustment for jpeg images (same as jpegdpi, but in pixels)\n");
+ printf("ppmdpi=<dpi> resolution adjustment for lossless images\n");
+ printf("ppmsubpixels=<pixels resolution adjustment for lossless images (same as ppmdpi, but in pixels)\n");
+ printf("subpixels=<pixels> 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=<color) color of links (format: RRGGBBAA)\n");
+ printf("storeallcharacters don't reduce the fonts to used characters in the output file\n");
+ printf("enablezlib switch on zlib compression (also done if flashversion>=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=<name> when the user clicks a internal link (to a different page) in the converted file, this actionscript function is called\n");
+ printf("externallinkfunction=<name> 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=<width> 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=<version> the SWF fileversion (6)\n");
+ printf("minlinewidth=<width> 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=<quality> set compression quality of jpeg images\n");
} else {
return 0;
}
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);
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;
i->clippos --;
}
+ if(i->config_showclipshapes)
+ drawoutline(dev, line);
+
int myshapeid = getNewID(dev);
i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
RGBA col;
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);
msg("<trace> 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);
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)
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);
drawgfxline(dev, line);
msg("<trace> 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)
{
msg("<error> 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;
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;
}
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;
}
}
}
-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;
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("<error> 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);
-
-/* 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) {
+ msg("<warning> Font is NULL");
+ return;
+ }
+ if(glyph<0 || glyph>=i->swffont->numchars) {
+ msg("<warning> 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("<verbose> 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;
+ }
+
+ /*if(i->swffont->glyph[glyph].shape->bitlen <= 16) {
+ msg("<warning> 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("<verbose> 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("<trace> 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;
}