git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
several flash 8 fixes
[swftools.git]
/
lib
/
modules
/
swftext.c
diff --git
a/lib/modules/swftext.c
b/lib/modules/swftext.c
index
b6579d7
..
53abace
100644
(file)
--- a/
lib/modules/swftext.c
+++ b/
lib/modules/swftext.c
@@
-157,7
+157,7
@@
int swf_FontExtract_DefineFont(int id, SWFFONT * f, TAG * t)
of = swf_GetU16(t);
n = of / 2;
f->numchars = n;
of = swf_GetU16(t);
n = of / 2;
f->numchars = n;
- f->glyph = rfx_calloc(sizeof(SWFGLYPH) * n);
+ f->glyph = (SWFGLYPH*)rfx_calloc(sizeof(SWFGLYPH) * n);
for (i = 1; i < n; i++)
swf_GetU16(t);
for (i = 1; i < n; i++)
swf_GetU16(t);
@@
-237,8
+237,6
@@
int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t)
int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag)
{
U16 fid;
int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag)
{
U16 fid;
- U16 maxcode;
- U8 flags;
swf_SaveTagPos(tag);
swf_SetTagPos(tag, 0);
swf_SaveTagPos(tag);
swf_SetTagPos(tag, 0);
@@
-247,7
+245,7
@@
int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag)
if (fid == id) {
int num = swf_GetU16(tag);
int t;
if (fid == id) {
int num = swf_GetU16(tag);
int t;
- f->glyphnames = rfx_alloc(sizeof(char *) * num);
+ f->glyphnames = (char**)rfx_alloc(sizeof(char *) * num);
for (t = 0; t < num; t++) {
f->glyphnames[t] = strdup(swf_GetString(tag));
}
for (t = 0; t < num; t++) {
f->glyphnames[t] = strdup(swf_GetString(tag));
}
@@
-298,7
+296,7
@@
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 = (U32*)rfx_calloc(sizeof(U32)*(glyphcount+1));
offset_start = tag->pos;
if (flags1 & 8) { // wide offsets
offset_start = tag->pos;
if (flags1 & 8) { // wide offsets
@@
-358,7
+356,7
@@
int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
S16 advance = swf_GetS16(tag);
font->glyph[t].advance = advance;
}
S16 advance = swf_GetS16(tag);
font->glyph[t].advance = advance;
}
- font->layout->bounds = rfx_alloc(glyphcount * sizeof(SRECT));
+ font->layout->bounds = (SRECT*)rfx_alloc(glyphcount * sizeof(SRECT));
for (t = 0; t < glyphcount; t++) {
swf_ResetReadBits(tag);
swf_GetRect(tag, &font->layout->bounds[t]);
for (t = 0; t < glyphcount; t++) {
swf_ResetReadBits(tag);
swf_GetRect(tag, &font->layout->bounds[t]);
@@
-369,7
+367,7
@@
int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag)
font->layout->kerning = (SWFKERNING *) rfx_alloc(sizeof(SWFKERNING) * kerningcount);
if (kerningcount) {
font->layout->kerning = (SWFKERNING *) rfx_alloc(sizeof(SWFKERNING) * kerningcount);
if (kerningcount) {
- font->layout->kerning = rfx_alloc(sizeof(*font->layout->kerning) * kerningcount);
+ font->layout->kerning = (SWFKERNING*)rfx_alloc(sizeof(*font->layout->kerning) * kerningcount);
for (t = 0; t < kerningcount; t++) {
if (flags1 & 4) { // wide codes
font->layout->kerning[t].char1 = swf_GetU16(tag);
for (t = 0; t < kerningcount; t++) {
if (flags1 & 4) { // wide codes
font->layout->kerning[t].char1 = swf_GetU16(tag);
@@
-400,7
+398,7
@@
swf_FontExtract_DefineTextCallback(int id, SWFFONT * f, TAG * t, int jobs,
SRECT r;
MATRIX m;
U8 gbits, abits;
SRECT r;
MATRIX m;
U8 gbits, abits;
- int fid = 0;
+ int fid = -1;
RGBA color;
int x = 0, y = 0;
int fontsize = 0;
RGBA color;
int x = 0, y = 0;
int fontsize = 0;
@@
-459,7
+457,6
@@
swf_FontExtract_DefineTextCallback(int id, SWFFONT * f, TAG * t, int jobs,
adv = swf_GetBits(t, abits);
xpos += adv;
adv = swf_GetBits(t, abits);
xpos += adv;
- // <deprecated>
if (id == fid) {
if (jobs & FEDTJ_PRINT) {
int code = f->glyph2ascii[glyph];
if (id == fid) {
if (jobs & FEDTJ_PRINT) {
int code = f->glyph2ascii[glyph];
@@
-467,12
+464,7
@@
swf_FontExtract_DefineTextCallback(int id, SWFFONT * f, TAG * t, int jobs,
}
if (jobs & FEDTJ_MODIFY)
f->glyph[glyph].advance = adv * 20; //?
}
if (jobs & FEDTJ_MODIFY)
f->glyph[glyph].advance = adv * 20; //?
- } else {
- if (jobs & FEDTJ_PRINT) {
- printf("?");
- }
}
}
- // </deprecated>
buf[i] = glyph;
}
buf[i] = glyph;
}
@@
-684,7
+676,7
@@
int swf_FontReduce_swfc(SWFFONT * f)
}
f->use->used_glyphs = j;
for (i = 0; i < f->maxascii; i++) {
}
f->use->used_glyphs = j;
for (i = 0; i < f->maxascii; i++) {
- if(f->ascii2glyph[i] > -1)
+ if(f->ascii2glyph[i] > -1) {
if (f->use->chars[f->ascii2glyph[i]]<0) {
f->use->chars[f->ascii2glyph[i]] = 0;
f->ascii2glyph[i] = -1;
if (f->use->chars[f->ascii2glyph[i]]<0) {
f->use->chars[f->ascii2glyph[i]] = 0;
f->ascii2glyph[i] = -1;
@@
-693,6
+685,7
@@
int swf_FontReduce_swfc(SWFFONT * f)
f->use->chars[f->ascii2glyph[i]] = 1;
max_unicode = i + 1;
}
f->use->chars[f->ascii2glyph[i]] = 1;
max_unicode = i + 1;
}
+ }
}
f->maxascii = max_unicode;
f->use->is_reduced = 1;
}
f->maxascii = max_unicode;
f->use->is_reduced = 1;
@@
-746,13
+739,13
@@
int swf_FontReduce(SWFFONT * f)
void swf_FontSort(SWFFONT * font)
{
void swf_FontSort(SWFFONT * font)
{
- int i, j, k;
+ int i, j;
int *newplace;
int *newpos;
if (!font)
return;
int *newplace;
int *newpos;
if (!font)
return;
- newplace = rfx_alloc(sizeof(int) * font->numchars);
+ newplace = (int*)rfx_alloc(sizeof(int) * font->numchars);
for (i = 0; i < font->numchars; i++) {
newplace[i] = i;
for (i = 0; i < font->numchars; i++) {
newplace[i] = i;
@@
-790,7
+783,7
@@
void swf_FontSort(SWFFONT * font)
}
}
}
}
}
}
- newpos = rfx_alloc(sizeof(int) * font->numchars);
+ newpos = (int*)rfx_alloc(sizeof(int) * font->numchars);
for (i = 0; i < font->numchars; i++) {
newpos[newplace[i]] = i;
}
for (i = 0; i < font->numchars; i++) {
newpos[newplace[i]] = i;
}
@@
-818,9
+811,10
@@
int swf_FontInitUsage(SWFFONT * f)
fprintf(stderr, "Usage initialized twice");
return -1;
}
fprintf(stderr, "Usage initialized twice");
return -1;
}
- f->use = rfx_alloc(sizeof(FONTUSAGE));
+ f->use = (FONTUSAGE*)rfx_alloc(sizeof(FONTUSAGE));
f->use->is_reduced = 0;
f->use->is_reduced = 0;
- f->use->chars = rfx_calloc(sizeof(f->use->chars[0]) * f->numchars);
+ f->use->used_glyphs = 0;
+ f->use->chars = (int*)rfx_calloc(sizeof(f->use->chars[0]) * f->numchars);
return 0;
}
return 0;
}
@@
-936,7
+930,6
@@
int swf_FontSetDefine2(TAG * tag, SWFFONT * f)
U8 flags = 0;
int t;
int pos;
U8 flags = 0;
int t;
int pos;
- int pos2;
swf_SetU16(tag, f->id);
if (f->layout) flags |= 128; // haslayout
swf_SetU16(tag, f->id);
if (f->layout) flags |= 128; // haslayout
@@
-963,8
+956,8
@@
int swf_FontSetDefine2(TAG * tag, SWFFONT * f)
swf_SetU8(tag, 0); //reserved flags
if (f->name) {
/* font name */
swf_SetU8(tag, 0); //reserved flags
if (f->name) {
/* font name */
- swf_SetU8(tag, strlen(f->name));
- swf_SetBlock(tag, f->name, strlen(f->name));
+ swf_SetU8(tag, strlen((const char*)f->name));
+ swf_SetBlock(tag, f->name, strlen((const char*)f->name));
} else {
/* font name (="") */
swf_SetU8(tag, 0);
} else {
/* font name (="") */
swf_SetU8(tag, 0);
@@
-1066,7
+1059,7
@@
int swf_FontSetInfo(TAG * t, SWFFONT * f)
return -1;
swf_ResetWriteBits(t);
swf_SetU16(t, f->id);
return -1;
swf_ResetWriteBits(t);
swf_SetU16(t, f->id);
- l = f->name ? strlen(f->name) : 0;
+ l = f->name ? strlen((const char *)f->name) : 0;
if (l > 255)
l = 255;
swf_SetU8(t, l);
if (l > 255)
l = 255;
swf_SetU8(t, l);
@@
-1416,9
+1409,9
@@
void swf_WriteFont(SWFFONT * font, char *filename)
swf_SetU16(t, font->numchars);
for (c = 0; c < font->numchars; c++) {
if (font->glyphnames[c])
swf_SetU16(t, font->numchars);
for (c = 0; c < font->numchars; c++) {
if (font->glyphnames[c])
- swf_SetString(t, font->glyphnames[c]);
+ swf_SetString(t, (U8*)font->glyphnames[c]);
else
else
- swf_SetString(t, "");
+ swf_SetString(t, (U8*)"");
}
}
}
}
@@
-1567,9
+1560,9
@@
void swf_SetEditText(TAG * tag, U16 flags, SRECT r, char *text, RGBA * color, in
swf_SetU16(tag, layout->indent); //indent
swf_SetU16(tag, layout->leading); //leading
}
swf_SetU16(tag, layout->indent); //indent
swf_SetU16(tag, layout->leading); //leading
}
- swf_SetString(tag, variable);
+ swf_SetString(tag, (U8*)variable);
if (flags & ET_HASTEXT)
if (flags & ET_HASTEXT)
- swf_SetString(tag, text);
+ swf_SetString(tag, (U8*)text);
}
SRECT swf_SetDefineText(TAG * tag, SWFFONT * font, RGBA * rgb, char *text, int scale)
}
SRECT swf_SetDefineText(TAG * tag, SWFFONT * font, RGBA * rgb, char *text, int scale)
@@
-1582,7
+1575,7
@@
SRECT swf_SetDefineText(TAG * tag, SWFFONT * font, RGBA * rgb, char *text, int s
int pos = 0;
int ystep = 0;
if (font->layout) {
int pos = 0;
int ystep = 0;
if (font->layout) {
- r = swf_TextCalculateBBoxUTF8(font, text, scale * 20);
+ r = swf_TextCalculateBBoxUTF8(font, (U8*)text, scale * 20);
ystep = font->layout->leading;
} else {
fprintf(stderr, "No layout information- can't compute text bbox accurately");
ystep = font->layout->leading;
} else {
fprintf(stderr, "No layout information- can't compute text bbox accurately");
@@
-1606,7
+1599,7
@@
SRECT swf_SetDefineText(TAG * tag, SWFFONT * font, RGBA * rgb, char *text, int s
*/
swf_SetMatrix(tag, 0);
*/
swf_SetMatrix(tag, 0);
- swf_TextCountBitsUTF8(font, text, scale * 20, &gbits, &abits);
+ swf_TextCountBitsUTF8(font, (U8*)text, scale * 20, &gbits, &abits);
swf_SetU8(tag, gbits);
swf_SetU8(tag, abits);
swf_SetU8(tag, gbits);
swf_SetU8(tag, abits);