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 parsing for flash 8 fill styles
[swftools.git]
/
lib
/
modules
/
swfrender.c
diff --git
a/lib/modules/swfrender.c
b/lib/modules/swfrender.c
index
8be9cef
..
64dc696
100644
(file)
--- a/
lib/modules/swfrender.c
+++ b/
lib/modules/swfrender.c
@@
-1012,7
+1012,10
@@
static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int
textcallbackblock_t * info = (textcallbackblock_t*)self;
font_t*font = 0;
int t;
textcallbackblock_t * info = (textcallbackblock_t*)self;
font_t*font = 0;
int t;
- if(!info->idtable[fontid].obj.font) {
+ if(info->idtable[fontid].type != font_type) {
+ fprintf(stderr, "ID %d is not a font\n", fontid);
+ return;
+ } else if(!info->idtable[fontid].obj.font) {
fprintf(stderr, "Font %d unknown\n", fontid);
return;
} else {
fprintf(stderr, "Font %d unknown\n", fontid);
return;
} else {
@@
-1031,8
+1034,8
@@
static void textcallback(void*self, int*chars, int*xpos, int nr, int fontid, int
m.sy = (m.sy * fontsize) / 1024;
m.r0 = (m.r0 * fontsize) / 1024;
m.r1 = (m.r1 * fontsize) / 1024;
m.sy = (m.sy * fontsize) / 1024;
m.r0 = (m.r0 * fontsize) / 1024;
m.r1 = (m.r1 * fontsize) / 1024;
- m.tx += p.x;
- m.ty += p.y;
+ m.tx = p.x;
+ m.ty = p.y;
if(chars[t]<0 || chars[t]>= font->numchars) {
fprintf(stderr, "Character out of range: %d\n", chars[t]);
if(chars[t]<0 || chars[t]>= font->numchars) {
fprintf(stderr, "Character out of range: %d\n", chars[t]);
@@
-1155,11
+1158,13
@@
void swf_RenderSWF(RENDERBUF*buf, SWF*swf)
swf_GetU16(tag);
swf_GetRect(tag,0);
swf_GetMatrix(tag,&m);
swf_GetU16(tag);
swf_GetRect(tag,0);
swf_GetMatrix(tag,&m);
- swf_MatrixJoin(&info.m, &m, &p->matrix);
+ swf_MatrixJoin(&info.m, &p->matrix, &m);
/*printf("Text matrix:\n");
swf_DumpMatrix(stdout, &m);
printf("Placement matrix:\n");
/*printf("Text matrix:\n");
swf_DumpMatrix(stdout, &m);
printf("Placement matrix:\n");
- swf_DumpMatrix(stdout, &p->matrix);*/
+ swf_DumpMatrix(stdout, &p->matrix);
+ printf("Final matrix:\n");
+ swf_DumpMatrix(stdout, &info.m);*/
info.idtable = idtable;
info.depth = p->depth;
info.idtable = idtable;
info.depth = p->depth;