git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swfvideo.o is now compiled separately.
[swftools.git]
/
lib
/
modules
/
swftext.c
diff --git
a/lib/modules/swftext.c
b/lib/modules/swftext.c
index
10b04fc
..
8a04b38
100644
(file)
--- a/
lib/modules/swftext.c
+++ b/
lib/modules/swftext.c
@@
-685,7
+685,7
@@
int swf_TextCountBits(SWFFONT * font,U8 * s,int scale,U8 * gbits,U8 * abits)
if(s[0] < font->maxascii)
glyph = font->ascii2glyph[s[0]];
if(glyph>=0) {
if(s[0] < font->maxascii)
glyph = font->ascii2glyph[s[0]];
if(glyph>=0) {
- g = swf_CountBits(glyph,g);
+ g = swf_CountUBits(glyph,g);
a = swf_CountBits((((U32)font->glyph[glyph].advance)*scale)/100,a);
}
s++;
a = swf_CountBits((((U32)font->glyph[glyph].advance)*scale)/100,a);
}
s++;
@@
-1016,7
+1016,7
@@
void swf_FontCreateLayout(SWFFONT*f)
if(!shape2) {
fprintf(stderr, "Shape parse error\n");exit(1);
}
if(!shape2) {
fprintf(stderr, "Shape parse error\n");exit(1);
}
- bbox = swf_GetShapeBoundingBox(shape2->lines);
+ bbox = swf_GetShapeBoundingBox(shape2);
swf_Shape2Free(shape2);
f->layout->bounds[t] = bbox;
/* FIXME */
swf_Shape2Free(shape2);
f->layout->bounds[t] = bbox;
/* FIXME */