int config_drawonlyshapes;
int config_jpegquality;
int config_storeallcharacters;
+ int config_generate_fake_tags;
int config_enablezlib;
int config_insertstoptag;
int config_flashversion;
RGBA fillrgb;
int drawmode;
+ int shapeposx;
+ int shapeposy;
+
} swfoutput_internal;
static void swf_fillbitmap(gfxdevice_t*driver, gfxline_t*line, gfximage_t*img, gfxmatrix_t*move, gfxcxform_t*cxform);
static void swf_endframe(gfxdevice_t*dev);
static gfxresult_t* swf_finish(gfxdevice_t*driver);
-int getCharID(SWFFONT *font, int charnr, char *charname, int u);
-
static swfoutput_internal* init_internal_struct()
{
swfoutput_internal*i = (swfoutput_internal*)malloc(sizeof(swfoutput_internal));
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=5;
+ i->config_flashversion=6;
i->config_splinemaxerror=1;
i->config_fontsplinemaxerror=1;
i->config_filloverlap=0;
return 0;
}
/*if(swffont->glyph[charid].shape->bitlen <= 16) {
- msg("<warning> Character '%s' (c=%d,u=%d), glyph %d in current charset (%s, %d characters) is empty",
- FIXNULL(character),charnr, u, charid, FIXNULL((char*)swffont->name), swffont->numchars);
- return 0;
+ 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)
i->textid = -1;
}
-int getCharID(SWFFONT *font, int charnr, char *charname, int u)
-{
- int t;
- if(charname && font->glyphnames) {
- for(t=0;t<font->numchars;t++) {
- if(font->glyphnames[t] && !strcmp(font->glyphnames[t],charname)) {
- msg("<debug> Char [%d,>%s<,%d] maps to %d\n", charnr, charname, u, t);
- return t;
- }
- }
- /* if we didn't find the character, maybe
- we can find the capitalized version */
- for(t=0;t<font->numchars;t++) {
- if(font->glyphnames[t] && !strcasecmp(font->glyphnames[t],charname)) {
- msg("<debug> Char [%d,>>%s<<,%d] maps to %d\n", charnr, charname, u, t);
- return t;
- }
- }
- }
-
- if(u>0 && font->encoding != 255) {
- /* try to use the unicode id */
- if(u>=0 && u<font->maxascii && font->ascii2glyph[u]>=0) {
- msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->ascii2glyph[u]);
- return font->ascii2glyph[u];
- }
- }
-
- if(font->encoding != FONT_ENCODING_UNICODE) {
- /* the following only works if the font encoding
- is US-ASCII based. It's needed for fonts which return broken unicode
- indices */
- if(charnr>=0 && charnr<font->maxascii && font->ascii2glyph[charnr]>=0) {
- msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, font->ascii2glyph[charnr]);
- return font->ascii2glyph[charnr];
- }
- }
-
- if(charnr>=0 && charnr<font->numchars) {
- msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
- return charnr;
- }
-
- return -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)
i->shape=0;
}
i->fill=0;
+ i->shapeposx=0;
+ i->shapeposy=0;
}
static void endshape(gfxdevice_t*dev)
msg("<trace> Placing shape id %d", i->shapeid);
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(dev),&i->page_matrix,NULL,NULL);
+ MATRIX m = i->page_matrix;
+ m.tx += i->shapeposx;
+ m.ty += i->shapeposy;
+ swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(dev),&m,NULL,NULL);
swf_ShapeFree(i->shape);
i->shape = 0;
i->shapeid = -1;
i->bboxrectpos = -1;
- i->fill=0;
+ i->fill=0;
+ i->shapeposx=0;
+ i->shapeposy=0;
}
void wipeSWF(SWF*swf)
TAG*mtag = i->swf->firstTag;
if(iterator->swffont) {
mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
- if(!i->config_storeallcharacters)
+ if(!i->config_storeallcharacters) {
+ msg("<debug> Reducing font %s", iterator->swffont->name);
swf_FontReduce(iterator->swffont);
+ }
swf_FontSetDefine2(mtag, iterator->swffont);
}
return (void*)(swf->movieSize.xmax/20);
} else if(!strcmp(name, "ymax")) {
return (void*)(swf->movieSize.ymax/20);
+ } else if(!strcmp(name, "width")) {
+ return (void*)((swf->movieSize.xmax - swf->movieSize.xmin)/20);
+ } else if(!strcmp(name, "height")) {
+ return (void*)((swf->movieSize.ymax - swf->movieSize.ymin)/20);
}
return 0;
}
static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
- if(i->linewidth == (U16)(_linewidth*20))
+ if(i->linewidth == (U16)(_linewidth*20+19))
return;
-
if(i->shapeid>=0)
endshape(dev);
- i->linewidth = (U16)(_linewidth*20);
+ i->linewidth = (U16)(_linewidth*20+19);
}
if(url[t]<'0' || url[t]>'9')
nodigit = 1;
if(!nodigit) {
- int page = atoi(&url[4]);
+ int page = atoi(&url[4]) - 1;
+ if(page<0) page = 0;
swfoutput_linktopage(dev, page, points);
}
} else {
i->config_bboxvars = atoi(value);
} else if(!strcmp(name, "insertstop")) {
i->config_insertstoptag = atoi(value);
- } else if(!strcmp(name, "protected")) {
+ } else if(!strcmp(name, "protect")) {
i->config_protect = atoi(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, "minlinewidth")) {
i->config_minlinewidth = atof(value);
} else if(!strcmp(name, "caplinewidth")) {
double x=0,y=0;
/* factor which determines into how many line fragments a spline is converted */
- double subfraction = 1.2;//0.3
+ double subfraction = 2.4;//0.3
l2 = line;
while(l2) {
return -1;
/* TODO: cache images */
- *newwidth = sizex;
- *newheight = sizey;
if(newsizex<sizex || newsizey<sizey) {
msg("<verbose> Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey);
*newwidth = sizex = newsizex;
*newheight = sizey = newsizey;
mem = newpic;
-
+ } else {
+ *newwidth = newsizex = sizex;
+ *newheight = newsizey = sizey;
}
int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0);
printf("\n");
}
+gfxline_t* gfxline_move(gfxline_t*line, double x, double y)
+{
+ gfxline_t*l = line = gfxline_clone(line);
+
+ while(l) {
+ l->x += x;
+ l->y += y;
+ l->sx += x;
+ l->sy += y;
+ l = l->next;
+ }
+ return line;
+}
+
+//#define NORMALIZE_POLYGON_POSITIONS
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)
{
if(!has_dots &&
(width <= i->config_caplinewidth
|| (cap_style == gfx_capRound && joint_style == gfx_joinRound)
- || (cap_style == gfx_capRound && type<=2))) {
- msg("<trace> draw as stroke, type=%d dots=%d", type, has_dots);
- endtext(dev);
- swfoutput_setstrokecolor(dev, color->r, color->g, color->b, color->a);
- swfoutput_setlinewidth(dev, width);
- startshape(dev);
- stopFill(dev);
- drawgfxline(dev, line);
- } else {
+ || (cap_style == gfx_capRound && type<=2))) {} else
+ {
+ /* convert line to polygon */
msg("<trace> draw as polygon, type=%d dots=%d", type, has_dots);
if(has_dots)
gfxline_fix_short_edges(line);
dev->fill(dev, gfxline, color);
free(gfxline);
art_svp_free(svp);
+ return;
}
+
+ 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
+
+ swfoutput_setstrokecolor(dev, color->r, color->g, color->b, color->a);
+ swfoutput_setlinewidth(dev, width);
+ startshape(dev);
+ stopFill(dev);
+ drawgfxline(dev, line);
+
+#ifdef NORMALIZE_POLYGON_POSITIONS
+ free(line); //account for _move
+#endif
+
}
static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
{
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
+
swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a);
startshape(dev);
startFill(dev);
i->fill=1;
drawgfxline(dev, line);
msg("<trace> end of swf_fill (shapeid=%d)", i->shapeid);
+
+#ifdef NORMALIZE_POLYGON_POSITIONS
+ free(line); //account for _move
+#endif
}
static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
{
m.m22 = i->fontm22;
m.m31 = matrix->tx;
m.m32 = matrix->ty;
+
+/* printf("%f %f\n", m.m31, m.m32);
+ {
+ static int xpos = 40;
+ static int ypos = 200;
+ m.m31 = xpos;
+ m.m32 = ypos;
+ xpos += 10;
+ }*/
+
+
drawchar(dev, i->swffont, glyph, &m, color);
}
git.asbjorn.biz / swftools.git / blobdiff