{
int t, glyphcount;
int maxcode;
+ int fid;
U8 flags1,flags2,namelen;
+ swf_SaveTagPos(tag);
+ swf_SetTagPos(tag,0);
font->version=2;
- font->id = swf_GetU16(tag);
+ fid = swf_GetU16(tag);
+ if(id && id!=fid)
+ return;
+ font->id = fid;
flags1 = swf_GetU8(tag);
flags2 = swf_GetU8(tag); //reserved flags
namelen = swf_GetU8(tag);
font->layout->kerning[t].char1 = swf_GetU16(tag);
font->layout->kerning[t].char2 = swf_GetU16(tag);
} else {
- font->layout->kerning[t].char1 = swf_GetU16(tag);
- font->layout->kerning[t].char2 = swf_GetU16(tag);
+ font->layout->kerning[t].char1 = swf_GetU8(tag);
+ font->layout->kerning[t].char2 = swf_GetU8(tag);
}
font->layout->kerning[t].adjustment = swf_GetS16(tag);
}
}
}
+ swf_RestoreTagPos(t);
return font->id;
}
}
else
{ swf_ShapeFree(f->glyph[i].shape);
- f->ascii2glyph[f->glyph2ascii[i]] = -1;
+ f->ascii2glyph[f->glyph2ascii[i]] = -1;
f->glyph2ascii[i] = 0;
- f->glyph[i].shape = 0;
+ f->glyph[i].shape = NULL;
f->glyph[i].advance = 0;
}
} else f->ascii2glyph[f->glyph2ascii[i]] = -1;
return res;
}
-void swf_WriteFont(SWFFONT*font, char* filename, int useDefineFont2)
+SWFFONT* swf_ReadFont(char* filename)
+{
+ int f;
+ SWF swf;
+ if(!filename)
+ return 0;
+ f = open(filename,O_RDONLY);
+
+ if (f<0 || swf_ReadSWF(f,&swf)<0)
+ { fprintf(stderr,"%s is not a valid SWF font file or contains errors.\n",filename);
+ close(f);
+ return 0;
+ }
+ else
+ { SWFFONT*font;
+ close(f);
+ if(swf_FontExtract(&swf, WRITEFONTID, &font) < 0)
+ return 0;
+ swf_FreeTags(&swf);
+ return font;
+ }
+}
+
+void swf_WriteFont(SWFFONT*font, char* filename)
{ SWF swf;
TAG * t;
SRECT r;
RGBA rgb;
int f;
+ int useDefineFont2 = 1;
if(useDefineFont2) {
- fprintf(stderr, "DefineFont2 is not yet supported!\n");
+ //fprintf(stderr, "DefineFont2 is not yet supported!\n");
useDefineFont2 = 0;
}
{
t = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
swf.firstTag = t;
- rgb.r = 0xff;
- rgb.g = 0xff;
- rgb.b = 0xff;
- swf_SetRGB(t,&rgb);
+ rgb.r = 0xff;
+ rgb.g = 0xff;
+ rgb.b = 0xff;
+ swf_SetRGB(t,&rgb);
t = swf_InsertTag(t,ST_DEFINEFONT);
}
else
swf_FontSetInfo(t,font);
if(!useDefineFont2)
- {
- int textscale = 400;
+ { int textscale = 400;
int s;
int xmax = 0;
- int ymax = textscale * 20;
+ int ymax = textscale * 2 * 20;
U8 gbits,abits;
char text[257];
int x,y;
}
}
if(c) {
- swf_TextSetInfoRecord(t,font,textscale,&rgb,lastx+1,textscale*y);
+ swf_TextSetInfoRecord(t,font,textscale,&rgb,lastx+1,textscale*y*2);
for(x=0;x<16;x++)
{
int g = font->ascii2glyph[y*16+x];
}
}
swf_SetU8(t,0);
+
- t = swf_InsertTag(t,ST_PLACEOBJECT2);
+ t = swf_InsertTag(t,ST_PLACEOBJECT2);
- swf_ObjectPlace(t,font->id+1,1,NULL,NULL,NULL);
+ swf_ObjectPlace(t,font->id+1,1,NULL,NULL,NULL);
- t = swf_InsertTag(t,ST_SHOWFRAME);
+ t = swf_InsertTag(t,ST_SHOWFRAME);
}
t = swf_InsertTag(t,ST_END);
swf_FreeTags(&swf);
}
-SWFFONT* swf_ReadFont(char* filename)
-{
- int f;
- SWF swf;
- if(!filename)
- return 0;
- f = open(filename,O_RDONLY);
-
- if (f<0 || swf_ReadSWF(f,&swf)<0)
- { fprintf(stderr,"%s is not a valid SWF font file or contains errors.\n",filename);
- close(f);
- return 0;
- }
- else
- { SWFFONT*font;
- close(f);
- if(swf_FontExtract(&swf, WRITEFONTID, &font) < 0)
- return 0;
- swf_FreeTags(&swf);
- return font;
- }
-}