git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added some verbosity
[swftools.git]
/
lib
/
modules
/
swftext.c
diff --git
a/lib/modules/swftext.c
b/lib/modules/swftext.c
index
76162e7
..
b1a1080
100644
(file)
--- a/
lib/modules/swftext.c
+++ b/
lib/modules/swftext.c
@@
-263,6
+263,8
@@
int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
int t, glyphcount;
int maxcode;
int fid;
int t, glyphcount;
int maxcode;
int fid;
+ U32 offset_start;
+ U32 *offset;
U8 flags1, flags2, namelen;
swf_SaveTagPos(tag);
swf_SetTagPos(tag, 0);
U8 flags1, flags2, namelen;
swf_SaveTagPos(tag);
swf_SetTagPos(tag, 0);
@@
-296,23
+298,34
@@
int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
font->glyph = (SWFGLYPH *) rfx_calloc(sizeof(SWFGLYPH) * glyphcount);
font->glyph2ascii = (U16 *) rfx_calloc(sizeof(U16) * glyphcount);
font->glyph = (SWFGLYPH *) rfx_calloc(sizeof(SWFGLYPH) * glyphcount);
font->glyph2ascii = (U16 *) rfx_calloc(sizeof(U16) * glyphcount);
+ offset = rfx_calloc(sizeof(U32)*(glyphcount+1));
+ offset_start = tag->pos;
+
if (flags1 & 8) { // wide offsets
for (t = 0; t < glyphcount; t++)
if (flags1 & 8) { // wide offsets
for (t = 0; t < glyphcount; t++)
- swf_GetU32(tag); //offset[t]
+ offset[t] = swf_GetU32(tag); //offset[t]
if (glyphcount) /* this _if_ is not in the specs */
if (glyphcount) /* this _if_ is not in the specs */
- swf_GetU32(tag); // fontcodeoffset
+ offset[glyphcount] = swf_GetU32(tag); // fontcodeoffset
+ else
+ offset[glyphcount] = tag->pos;
} else {
for (t = 0; t < glyphcount; t++)
} else {
for (t = 0; t < glyphcount; t++)
- swf_GetU16(tag); //offset[t]
+ offset[t] = swf_GetU16(tag); //offset[t]
if (glyphcount) /* this _if_ is not in the specs */
if (glyphcount) /* this _if_ is not in the specs */
- swf_GetU16(tag); // fontcodeoffset
+ offset[glyphcount] = swf_GetU16(tag); // fontcodeoffset
+ else
+ offset[glyphcount] = tag->pos;
}
}
- /* TODO: we should use the offset positions, not just
- blindly read in shapes */
- for (t = 0; t < glyphcount; t++)
+ for (t = 0; t < glyphcount; t++) {
+ swf_SetTagPos(tag, offset[t]+offset_start);
swf_GetSimpleShape(tag, &(font->glyph[t].shape));
swf_GetSimpleShape(tag, &(font->glyph[t].shape));
+ }
+
+ swf_SetTagPos(tag, offset[glyphcount]+offset_start);
+
+ free(offset);
maxcode = 0;
for (t = 0; t < glyphcount; t++) {
maxcode = 0;
for (t = 0; t < glyphcount; t++) {
@@
-418,6
+431,8
@@
swf_FontExtract_DefineTextCallback(int id, SWFFONT * f, TAG * t, int jobs,
color.b = swf_GetU8(t);
if (swf_GetTagID(t) == ST_DEFINETEXT2)
color.a = swf_GetU8(t);
color.b = swf_GetU8(t);
if (swf_GetTagID(t) == ST_DEFINETEXT2)
color.a = swf_GetU8(t);
+ else
+ color.a = 255;
}
if (flags & TF_HASXOFFSET)
x = swf_GetS16(t);
}
if (flags & TF_HASXOFFSET)
x = swf_GetS16(t);
@@
-560,8
+575,10
@@
static void font_freeglyphnames(SWFFONT*f)
if (f->glyphnames) {
int t;
for (t = 0; t < f->numchars; t++) {
if (f->glyphnames) {
int t;
for (t = 0; t < f->numchars; t++) {
- if (f->glyphnames[t])
+ if (f->glyphnames[t]) {
rfx_free(f->glyphnames[t]);
rfx_free(f->glyphnames[t]);
+ f->glyphnames[t] = 0;
+ }
}
rfx_free(f->glyphnames);
f->glyphnames = 0;
}
rfx_free(f->glyphnames);
f->glyphnames = 0;
@@
-642,6
+659,9
@@
int swf_FontReduce(SWFFONT * f)
int max_glyph = 0;
if ((!f) || (!f->use) || f->use->is_reduced)
return -1;
int max_glyph = 0;
if ((!f) || (!f->use) || f->use->is_reduced)
return -1;
+
+ font_freelayout(f);
+ font_freeglyphnames(f);
for (i = 0; i < f->numchars; i++) {
if(!f->use->chars[i]) {
for (i = 0; i < f->numchars; i++) {
if(!f->use->chars[i]) {
@@
-664,8
+684,6
@@
int swf_FontReduce(SWFFONT * f)
}
f->maxascii = max_unicode;
f->numchars = max_glyph;
}
f->maxascii = max_unicode;
f->numchars = max_glyph;
- font_freelayout(f);
- font_freeglyphnames(f);
font_freename(f);
return 0;
}
font_freename(f);
return 0;
}