git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small bugfixes
[swftools.git]
/
lib
/
devices
/
swf.c
diff --git
a/lib/devices/swf.c
b/lib/devices/swf.c
index
6d66409
..
5f0fe70
100644
(file)
--- a/
lib/devices/swf.c
+++ b/
lib/devices/swf.c
@@
-114,6
+114,7
@@
typedef struct _swfoutput_internal
int config_bboxvars;
int config_disable_polygon_conversion;
int config_normalize_polygon_positions;
int config_bboxvars;
int config_disable_polygon_conversion;
int config_normalize_polygon_positions;
+ int config_alignfonts;
char config_disablelinks;
RGBA config_linkcolor;
float config_minlinewidth;
char config_disablelinks;
RGBA config_linkcolor;
float config_minlinewidth;
@@
-623,6
+624,7
@@
static void chararray_writetotag(chararray_t*_chardata, TAG*tag)
int lastx;
int lasty;
int lastsize;
int lastx;
int lasty;
int lastsize;
+ int lastchar;
int charids[128];
int charadvance[128];
int charstorepos;
int charids[128];
int charadvance[128];
int charstorepos;
@@
-646,6
+648,7
@@
static void chararray_writetotag(chararray_t*_chardata, TAG*tag)
lastx = CHARMIDX;
lasty = CHARMIDY;
lastsize = -1;
lastx = CHARMIDX;
lasty = CHARMIDY;
lastsize = -1;
+ lastchar = -1;
if(pass==1)
{
if(pass==1)
{
@@
-670,9
+673,9
@@
static void chararray_writetotag(chararray_t*_chardata, TAG*tag)
charatposition_t*chr = &chardata->chr[t];
charatposition_t*chr = &chardata->chr[t];
- if(lastfont != chardata->chr[t].font ||
- lastx!=chardata->chr[t].x ||
- lasty!=chardata->chr[t].y ||
+ if(lastfont != chr->font ||
+ lastx!=chr->x ||
+ lasty!=chr->y ||
!colorcompare(&color, &chardata->chr[t].color) ||
charstorepos==127 ||
lastsize != chardata->chr[t].size ||
!colorcompare(&color, &chardata->chr[t].color) ||
charstorepos==127 ||
lastsize != chardata->chr[t].size ||
@@
-745,7
+748,7
@@
static void chararray_writetotag(chararray_t*_chardata, TAG*tag)
if(t<chardata->pos-1) nextx = chardata->chr[t+1].x;
if(t==chardata->pos-1 && chardata->next) nextx = chardata->next->chr[0].x;
int dx = nextx-chr->x;
if(t<chardata->pos-1) nextx = chardata->chr[t+1].x;
if(t==chardata->pos-1 && chardata->next) nextx = chardata->next->chr[0].x;
int dx = nextx-chr->x;
-
+
int advance;
if(dx>=0 && (dx<(1<<(advancebits-1)) || pass==0)) {
advance = dx;
int advance;
if(dx>=0 && (dx<(1<<(advancebits-1)) || pass==0)) {
advance = dx;
@@
-754,8
+757,10
@@
static void chararray_writetotag(chararray_t*_chardata, TAG*tag)
advance = 0;
lastx=chr->x;
}
advance = 0;
lastx=chr->x;
}
+
charids[charstorepos] = chr->charid;
charadvance[charstorepos] = advance;
charids[charstorepos] = chr->charid;
charadvance[charstorepos] = advance;
+ lastchar = chr->charid;
charstorepos ++;
}
chardata = chardata->next;
charstorepos ++;
}
chardata = chardata->next;
@@
-1465,6
+1470,8
@@
void swfoutput_finalize(gfxdevice_t*dev)
endpage(dev);
fontlist_t *iterator = i->fontlist;
endpage(dev);
fontlist_t *iterator = i->fontlist;
+ char use_font3 = i->config_flashversion>=8 && !NO_FONT3;
+
while(iterator) {
TAG*mtag = i->swf->firstTag;
if(iterator->swffont) {
while(iterator) {
TAG*mtag = i->swf->firstTag;
if(iterator->swffont) {
@@
-1474,29
+1481,25
@@
void swfoutput_finalize(gfxdevice_t*dev)
}
int used = iterator->swffont->use && iterator->swffont->use->used_glyphs;
if(used) {
}
int used = iterator->swffont->use && iterator->swffont->use->used_glyphs;
if(used) {
- if(i->config_flashversion<8 || NO_FONT3) {
+ if(!use_font3) {
mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
swf_FontSetDefine2(mtag, iterator->swffont);
} else {
mtag = swf_InsertTag(mtag, ST_DEFINEFONT3);
swf_FontSetDefine2(mtag, iterator->swffont);
mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
swf_FontSetDefine2(mtag, iterator->swffont);
} else {
mtag = swf_InsertTag(mtag, ST_DEFINEFONT3);
swf_FontSetDefine2(mtag, iterator->swffont);
-
- if(i->config_flashversion>=10)
- swf_FontCreateAlignZones(iterator->swffont);
-
- if(iterator->swffont->alignzones) {
- mtag = swf_InsertTag(mtag, ST_DEFINEFONTALIGNZONES);
- swf_FontSetAlignZones(mtag, iterator->swffont);
- }
}
}
}
iterator = iterator->next;
}
}
}
}
iterator = iterator->next;
}
-
+
i->tag = swf_InsertTag(i->tag,ST_END);
TAG* tag = i->tag->prev;
i->tag = swf_InsertTag(i->tag,ST_END);
TAG* tag = i->tag->prev;
+
+ if(use_font3 && i->config_storeallcharacters && i->config_alignfonts) {
+ swf_FontPostprocess(i->swf); // generate alignment information
+ }
/* remove the removeobject2 tags between the last ST_SHOWFRAME
and the ST_END- they confuse the flash player */
/* remove the removeobject2 tags between the last ST_SHOWFRAME
and the ST_END- they confuse the flash player */
@@
-3116,6
+3119,6
@@
static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
} else {
i->chardata = charbuffer_append(i->chardata, i->swffont, glyph, x, y, i->current_font_size, *(RGBA*)color, &i->fontmatrix);
}
} else {
i->chardata = charbuffer_append(i->chardata, i->swffont, glyph, x, y, i->current_font_size, *(RGBA*)color, &i->fontmatrix);
}
- swf_FontUseGlyph(i->swffont, glyph);
+ swf_FontUseGlyph(i->swffont, glyph, i->current_font_size);
return;
}
return;
}