git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
71586a0
)
gcc 2.95.* fixes.
author
kramm
<kramm>
Sat, 22 May 2004 00:12:28 +0000
(
00:12
+0000)
committer
kramm
<kramm>
Sat, 22 May 2004 00:12:28 +0000
(
00:12
+0000)
lib/rfxswf.c
patch
|
blob
|
history
src/swfbbox.c
patch
|
blob
|
history
src/swfc.c
patch
|
blob
|
history
diff --git
a/lib/rfxswf.c
b/lib/rfxswf.c
index
cd2e0b6
..
441e19d
100644
(file)
--- a/
lib/rfxswf.c
+++ b/
lib/rfxswf.c
@@
-1207,6
+1207,7
@@
int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file,
int fileSize = 0;
int inSprite = 0;
int writer_lastpos = 0;
int fileSize = 0;
int inSprite = 0;
int writer_lastpos = 0;
+ int ret;
if (!swf) return -1;
if (!writer) return -1; // the caller should provide a nullwriter, not 0, for querying SWF size
if (!swf) return -1;
if (!writer) return -1; // the caller should provide a nullwriter, not 0, for querying SWF size
@@
-1296,7
+1297,7
@@
int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file,
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
- int ret = writer->write(writer,b,swf_GetTagLen(&t1));
+ ret = writer->write(writer,b,swf_GetTagLen(&t1));
if (ret!=swf_GetTagLen(&t1))
{
#ifdef DEBUG_RFXSWF
if (ret!=swf_GetTagLen(&t1))
{
#ifdef DEBUG_RFXSWF
diff --git
a/src/swfbbox.c
b/src/swfbbox.c
index
8259481
..
70e1ac0
100644
(file)
--- a/
src/swfbbox.c
+++ b/
src/swfbbox.c
@@
-262,6
+262,7
@@
static void swf_OptimizeBoundingBoxes(SWF*swf)
int matrix_offset;
int len;
U8*data;
int matrix_offset;
int len;
U8*data;
+ textbounds_t bounds;
if(verbose) printf("%s\n", swf_TagGetName(tag));
if(fontnum < 0) {
if(verbose) printf("Extracting fonts...\n");
if(verbose) printf("%s\n", swf_TagGetName(tag));
if(fontnum < 0) {
if(verbose) printf("Extracting fonts...\n");
@@
-274,7
+275,6
@@
static void swf_OptimizeBoundingBoxes(SWF*swf)
swf_FontEnumerate(swf,&fontcallback2);
}
swf_FontEnumerate(swf,&fontcallback2);
}
- textbounds_t bounds;
memset(&bounds, 0, sizeof(bounds));
swf_SetTagPos(tag, 0);
memset(&bounds, 0, sizeof(bounds));
swf_SetTagPos(tag, 0);
diff --git
a/src/swfc.c
b/src/swfc.c
index
05003f8
..
ad923d3
100644
(file)
--- a/
src/swfc.c
+++ b/
src/swfc.c
@@
-476,6
+476,7
@@
void s_buttonput(char*character, char*as, parameters_t p)
character_t* c = dictionary_lookup(&characters, character);
MATRIX m;
int flags = 0;
character_t* c = dictionary_lookup(&characters, character);
MATRIX m;
int flags = 0;
+ buttonrecord_t r;
if(!c) {
syntaxerror("character %s not known (in .shape %s)", character, character);
}
if(!c) {
syntaxerror("character %s not known (in .shape %s)", character, character);
}
@@
-485,7
+486,6
@@
void s_buttonput(char*character, char*as, parameters_t p)
m = s_instancepos(c->size, &p);
m = s_instancepos(c->size, &p);
- buttonrecord_t r;
r.id = c->id;
r.matrix = m;
r.cxform = p.cxform;
r.id = c->id;
r.matrix = m;
r.cxform = p.cxform;
@@
-537,12
+537,13
@@
void s_buttonaction(int flags, char*action)
static void s_endButton()
{
static void s_endButton()
{
+ SRECT r;
setbuttonrecords(stack[stackpos-1].tag);
stackpos--;
swf_ButtonPostProcess(stack[stackpos].tag, mybutton.nr_actions);
setbuttonrecords(stack[stackpos-1].tag);
stackpos--;
swf_ButtonPostProcess(stack[stackpos].tag, mybutton.nr_actions);
- SRECT r = currentrect;
+ r = currentrect;
tag = stack[stackpos].tag;
currentrect = stack[stackpos].oldrect;
tag = stack[stackpos].tag;
currentrect = stack[stackpos].oldrect;
@@
-2254,6
+2255,7
@@
static int current_button_flags = 0;
static int c_on_press(map_t*args)
{
char*position = lu(args, "position");
static int c_on_press(map_t*args)
{
char*position = lu(args, "position");
+ char*action = "";
if(!strcmp(position, "inside")) {
current_button_flags |= BC_OVERUP_OVERDOWN;
} else if(!strcmp(position, "outside")) {
if(!strcmp(position, "inside")) {
current_button_flags |= BC_OVERUP_OVERDOWN;
} else if(!strcmp(position, "outside")) {
@@
-2262,7
+2264,6
@@
static int c_on_press(map_t*args)
} else if(!strcmp(position, "anywhere")) {
current_button_flags |= /*BC_IDLE_OUTDOWN|*/BC_OVERUP_OVERDOWN|BC_IDLE_OVERDOWN;
}
} else if(!strcmp(position, "anywhere")) {
current_button_flags |= /*BC_IDLE_OUTDOWN|*/BC_OVERUP_OVERDOWN|BC_IDLE_OVERDOWN;
}
- char*action = "";
readToken();
if(type == RAWDATA) {
action = text;
readToken();
if(type == RAWDATA) {
action = text;
@@
-2276,6
+2277,7
@@
static int c_on_press(map_t*args)
static int c_on_release(map_t*args)
{
char*position = lu(args, "position");
static int c_on_release(map_t*args)
{
char*position = lu(args, "position");
+ char*action = "";
if(!strcmp(position, "inside")) {
current_button_flags |= BC_OVERDOWN_OVERUP;
} else if(!strcmp(position, "outside")) {
if(!strcmp(position, "inside")) {
current_button_flags |= BC_OVERDOWN_OVERUP;
} else if(!strcmp(position, "outside")) {
@@
-2283,7
+2285,6
@@
static int c_on_release(map_t*args)
} else if(!strcmp(position, "anywhere")) {
current_button_flags |= BC_OVERDOWN_OVERUP|BC_OUTDOWN_IDLE|BC_OVERDOWN_IDLE;
}
} else if(!strcmp(position, "anywhere")) {
current_button_flags |= BC_OVERDOWN_OVERUP|BC_OUTDOWN_IDLE|BC_OVERDOWN_IDLE;
}
- char*action = "";
readToken();
if(type == RAWDATA) {
action = text;
readToken();
if(type == RAWDATA) {
action = text;
@@
-2297,6
+2298,7
@@
static int c_on_release(map_t*args)
static int c_on_move_in(map_t*args)
{
char*position = lu(args, "state");
static int c_on_move_in(map_t*args)
{
char*position = lu(args, "state");
+ char*action = "";
if(!strcmp(position, "pressed")) {
current_button_flags |= BC_OUTDOWN_OVERDOWN;
} else if(!strcmp(position, "not_pressed")) {
if(!strcmp(position, "pressed")) {
current_button_flags |= BC_OUTDOWN_OVERDOWN;
} else if(!strcmp(position, "not_pressed")) {
@@
-2304,7
+2306,6
@@
static int c_on_move_in(map_t*args)
} else if(!strcmp(position, "any")) {
current_button_flags |= BC_OUTDOWN_OVERDOWN|BC_IDLE_OVERUP|BC_IDLE_OVERDOWN;
}
} else if(!strcmp(position, "any")) {
current_button_flags |= BC_OUTDOWN_OVERDOWN|BC_IDLE_OVERUP|BC_IDLE_OVERDOWN;
}
- char*action = "";
readToken();
if(type == RAWDATA) {
action = text;
readToken();
if(type == RAWDATA) {
action = text;
@@
-2318,6
+2319,7
@@
static int c_on_move_in(map_t*args)
static int c_on_move_out(map_t*args)
{
char*position = lu(args, "state");
static int c_on_move_out(map_t*args)
{
char*position = lu(args, "state");
+ char*action = "";
if(!strcmp(position, "pressed")) {
current_button_flags |= BC_OVERDOWN_OUTDOWN;
} else if(!strcmp(position, "not_pressed")) {
if(!strcmp(position, "pressed")) {
current_button_flags |= BC_OVERDOWN_OUTDOWN;
} else if(!strcmp(position, "not_pressed")) {
@@
-2325,7
+2327,6
@@
static int c_on_move_out(map_t*args)
} else if(!strcmp(position, "any")) {
current_button_flags |= BC_OVERDOWN_OUTDOWN|BC_OVERUP_IDLE|BC_OVERDOWN_IDLE;
}
} else if(!strcmp(position, "any")) {
current_button_flags |= BC_OVERDOWN_OUTDOWN|BC_OVERUP_IDLE|BC_OVERDOWN_IDLE;
}
- char*action = "";
readToken();
if(type == RAWDATA) {
action = text;
readToken();
if(type == RAWDATA) {
action = text;
@@
-2339,6
+2340,7
@@
static int c_on_move_out(map_t*args)
static int c_on_key(map_t*args)
{
char*key = lu(args, "key");
static int c_on_key(map_t*args)
{
char*key = lu(args, "key");
+ char*action = "";
if(strlen(key)==1) {
/* ascii */
if(key[0]>=32) {
if(strlen(key)==1) {
/* ascii */
if(key[0]>=32) {
@@
-2355,7
+2357,6
@@
static int c_on_key(map_t*args)
*/
syntaxerror("invalid key: %s",key);
}
*/
syntaxerror("invalid key: %s",key);
}
- char*action = "";
readToken();
if(type == RAWDATA) {
action = text;
readToken();
if(type == RAWDATA) {
action = text;