From 9b7ed00673462ed1846ff03f0e77a5405ad1a50d Mon Sep 17 00:00:00 2001 From: kramm Date: Sat, 5 Jul 2003 17:10:14 +0000 Subject: [PATCH] changed logf to msg. --- src/swfc.c | 12 +++-- src/swfcombine.c | 128 +++++++++++++++++++++++++++--------------------------- src/swfextract.c | 22 +++++----- 3 files changed, 84 insertions(+), 78 deletions(-) diff --git a/src/swfc.c b/src/swfc.c index bdb631a..9e4d69b 100644 --- a/src/swfc.c +++ b/src/swfc.c @@ -13,9 +13,7 @@ #include #include #include -#define logf logarithmf // logf is also used by ../lib/log.h #include -#undef logf #include "../config.h" #include "../lib/rfxswf.h" #include "../lib/log.h" @@ -1315,6 +1313,10 @@ SPOINT getPoint(SRECT r, char*name) l--; return *(SPOINT*)&mpoints.buffer[l]; } +static int c_gradient(map_t*args) +{ + return 0; +} static int c_point(map_t*args) { char*name = lu(args, "name"); @@ -1731,6 +1733,11 @@ static struct { {"font", c_font, "name filename"}, {"soundtrack", c_soundtrack, "filename"}, + // generators of primitives + + {"point", c_point, "name x=0 y=0"}, + {"gradient", c_gradient, "name"}, + // character generators {"box", c_primitive, "name width height color=white line=1 @fill=none"}, {"circle", c_primitive, "name r color=white line=1 @fill=none"}, @@ -1757,7 +1764,6 @@ static struct { // virtual object placement {"buttonput", c_buttonput, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex=100% scaley=100% shear=0 rotate=0 above= below="}, {"texture", c_texture, " x=0 y=0 scale= scalex=100% scaley=100% shear=0 rotate=0"}, - {"point", c_point, "name x=0 y=0"}, // commands which start a block //startclip (see above) diff --git a/src/swfcombine.c b/src/swfcombine.c index e76b5c6..4b5af94 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -219,7 +219,7 @@ int args_callback_command(char*name, char*val) { config.movex = config.movey = 0; config.scalex = config.scaley = 1.0; } else { - logf(" slave entity %s (named \"%s\")\n", filename, myname); + msg(" slave entity %s (named \"%s\")\n", filename, myname); slave_filename[numslaves] = filename; slave_name[numslaves] = myname; @@ -281,11 +281,11 @@ static void makestackmaster(SWF*swf) int fi=open(slave_filename[t],O_RDONLY|O_BINARY); TAG*tag; if(fi<0 || swf_ReadSWF(fi, &head)<0) { - logf(" Couldn't open/read %s.", slave_filename[t]); + msg(" Couldn't open/read %s.", slave_filename[t]); exit(1); } close(fi); - logf(" File %s has bounding box %d:%d:%d:%d\n", + msg(" File %s has bounding box %d:%d:%d:%d\n", slave_filename[t], head.movieSize.xmin, head.movieSize.ymin, head.movieSize.xmax, head.movieSize.ymax); @@ -314,7 +314,7 @@ static void makestackmaster(SWF*swf) if(head.movieSize.ymax > box.ymax) box.ymax = head.movieSize.ymax; } - logf(" New master bounding box is %d:%d:%d:%d\n", + msg(" New master bounding box is %d:%d:%d:%d\n", box.xmin, box.ymin, box.xmax, box.ymax); swf_FreeTags(&head); @@ -353,7 +353,7 @@ static void makestackmaster(SWF*swf) } } tag = swf_InsertTag(tag, ST_END); - logf(" temporary SWF created"); + msg(" temporary SWF created"); } static char* slavename = 0; @@ -415,7 +415,7 @@ void jpeg_assert(SWF*master, SWF*slave) } } if(spos && mpos) { - logf(" Master and slave have incompatible JPEGTABLES."); + msg(" Master and slave have incompatible JPEGTABLES."); } } @@ -424,17 +424,17 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite) TAG*rtag = sprite->firstTag; while(rtag && rtag->id!=ST_END) { if(!swf_isAllowedSpriteTag(rtag)) { - logf(" processing sprite tag %02x", tag->id); + msg(" processing sprite tag %02x", tag->id); if(swf_isDefiningTag(rtag)) { - logf(" [sprite defs] write tag %02x (%d bytes in body)", + msg(" [sprite defs] write tag %02x (%d bytes in body)", tag->id, tag->len); tag = swf_InsertTag(tag, rtag->id); swf_SetBlock(tag, rtag->data, rtag->len); } else if(swf_isPseudoDefiningTag(rtag)) { - logf(" [sprite defs] write tag %02x (%d bytes in body)", + msg(" [sprite defs] write tag %02x (%d bytes in body)", tag->id, tag->len); tag = swf_InsertTag(tag, rtag->id); swf_SetBlock(tag, rtag->data, rtag->len); @@ -450,21 +450,21 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite) swf_SetBlock(tag, rtag->data, rtag->len); break; case ST_EXPORTASSETS: - logf(" deliberately ignoring EXPORTASSETS tag"); + msg(" deliberately ignoring EXPORTASSETS tag"); break; case ST_ENABLEDEBUGGER: - logf(" deliberately ignoring ENABLEDEBUGGER tag"); + msg(" deliberately ignoring ENABLEDEBUGGER tag"); break; case ST_SETBACKGROUNDCOLOR: - logf(" deliberately ignoring BACKGROUNDCOLOR tag"); + msg(" deliberately ignoring BACKGROUNDCOLOR tag"); break; case 40: case 49: case 51: - logf(" found tag %d. This is a Generator template, isn't it?", tag->id); + msg(" found tag %d. This is a Generator template, isn't it?", tag->id); break; default: - logf(" funny tag: %d is neither defining nor sprite", tag->id); + msg(" funny tag: %d is neither defining nor sprite", tag->id); } } } @@ -565,10 +565,10 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) definespritetag = tag = swf_InsertTag(tag, ST_DEFINESPRITE); swf_SetU16(tag, spriteid); swf_SetU16(tag, sprite->frameCount); - logf (" sprite id is %d", spriteid); + msg (" sprite id is %d", spriteid); tmp = sprite->frameCount; - logf(" %d frames to go",tmp); + msg(" %d frames to go",tmp); if(config.clip) { tag = swf_InsertTag(tag, ST_PLACEOBJECT2); @@ -590,7 +590,7 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) { if (swf_isAllowedSpriteTag(rtag)) { - logf(" [sprite main] write tag %02x (%d bytes in body)", + msg(" [sprite main] write tag %02x (%d bytes in body)", rtag->id, rtag->len); tag = swf_InsertTag(tag, rtag->id); write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley, 0); @@ -600,7 +600,7 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) if(tag->id == ST_SHOWFRAME) { tmp--; - logf(" %d frames to go",tmp); + msg(" %d frames to go",tmp); } } rtag = rtag->next; @@ -650,7 +650,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if(swf_isDefiningTag(rtag) && (flags&FLAGS_WRITEDEFINES)) { - logf(" [master] write tag %02x (%d bytes in body)", + msg(" [master] write tag %02x (%d bytes in body)", rtag->id, rtag->len); if(swf_GetDefineID(rtag) == spriteid && !config.isframe) { @@ -661,7 +661,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi swf_SetDefineID(tag, replaceddefine); } else { /* don't write this tag */ - logf(" replacing tag %d id %d with sprite", rtag->id + msg(" replacing tag %d id %d with sprite", rtag->id ,spriteid); } @@ -690,7 +690,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi int id = get_free_id(masterbitmap); int depth = 0; if(config.clip) { - logf(" Can't combine --clip and --frame"); + msg(" Can't combine --clip and --frame"); } tag = write_sprite_defines(tag, slave); @@ -725,7 +725,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi break; } if(!dontwrite) { - logf(" [master] write tag %02x (%d bytes in body)", + msg(" [master] write tag %02x (%d bytes in body)", rtag->id, rtag->len); tag = swf_InsertTag(tag, rtag->id); write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1); @@ -746,10 +746,10 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if(!slavewritten && config.isframe && (flags&(FLAGS_WRITESLAVE|FLAGS_WRITESPRITE))) { if(slaveframe>=0) - logf(" Frame %d doesn't exist in file. No substitution will occur", + msg(" Frame %d doesn't exist in file. No substitution will occur", slaveframe); else - logf(" Frame \"%s\" doesn't exist in file. No substitution will occur", + msg(" Frame \"%s\" doesn't exist in file. No substitution will occur", slavename); } tag = swf_InsertTag(tag, ST_END); @@ -777,7 +777,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) TAG*tag; TAG*mtag,*stag; if(config.isframe) { - logf(" Can't combine --cat and --frame"); + msg(" Can't combine --cat and --frame"); exit(1); } @@ -786,7 +786,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { if(swf_isDefiningTag(tag)) { int defineid = swf_GetDefineID(tag); - logf(" tagid %02x defines object %d", tag->id, defineid); + msg(" tagid %02x defines object %d", tag->id, defineid); masterbitmap[defineid] = 1; } tag = tag->next; @@ -802,7 +802,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) depths = malloc(65536); if(!depths) { - logf(" Couldn't allocate %d bytes of memory", 65536); + msg(" Couldn't allocate %d bytes of memory", 65536); return; } memset(depths, 0, 65536); @@ -811,7 +811,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { int num=1; U16 depth; - logf(" [master] write tag %02x (%d bytes in body)", + msg(" [master] write tag %02x (%d bytes in body)", mtag->id, mtag->len); switch(mtag->id) { case ST_PLACEOBJECT2: @@ -851,7 +851,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) stag = slave->firstTag; while(stag && stag->id!=ST_END) { - logf(" [slave] write tag %02x (%d bytes in body)", + msg(" [slave] write tag %02x (%d bytes in body)", stag->id, stag->len); tag = swf_InsertTag(tag, stag->id); swf_SetBlock(tag, stag->data, stag->len); @@ -877,12 +877,12 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { if(swf_isDefiningTag(tag)) { int defineid = swf_GetDefineID(tag); - logf(" tagid %02x defines object %d", tag->id, defineid); + msg(" tagid %02x defines object %d", tag->id, defineid); masterbitmap[defineid] = 1; if (!slavename && defineid==slaveid) { if(defineid>=0) { spriteid = defineid; - logf(" Slave file attached to object %d.", defineid); + msg(" Slave file attached to object %d.", defineid); } } } else if(tag->id == ST_PLACEOBJECT2) { @@ -890,26 +890,26 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) int id = swf_GetPlaceID(tag); if(name) - logf(" tagid %02x places object %d named \"%s\"", tag->id, id, name); + msg(" tagid %02x places object %d named \"%s\"", tag->id, id, name); else - logf(" tagid %02x places object %d (no name)", tag->id, id); + msg(" tagid %02x places object %d (no name)", tag->id, id); if (name && slavename && !strcmp(name,slavename)) { if(id>=0) { spriteid = id; - logf(" Slave file attached to named object %s (%d).", name, id); + msg(" Slave file attached to named object %s (%d).", name, id); } } } else if(tag->id == ST_SHOWFRAME) { if(slaveframe>=0 && frame==slaveframe) { - logf(" Slave file attached to frame %d.", frame); + msg(" Slave file attached to frame %d.", frame); } frame++; } else if(tag->id == ST_FRAMELABEL) { char * name = tag->data; if(name && slavename && config.isframe && !strcmp(name, slavename)) { slaveframe = frame; - logf(" Slave file attached to frame %d (%s).", frame, name); + msg(" Slave file attached to frame %d (%s).", frame, name); } } tag = tag->next; @@ -918,10 +918,10 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) if (spriteid<0 && !config.isframe) { if(slavename) { if(strcmp(slavename,"!!dummy!!")) - logf(" Didn't find anything named %s in file. No substitutions will occur.", slavename); + msg(" Didn't find anything named %s in file. No substitutions will occur.", slavename); } else - logf(" Didn't find id %d in file. No substitutions will occur.", slaveid); + msg(" Didn't find id %d in file. No substitutions will occur.", slaveid); spriteid = get_free_id(masterbitmap); } @@ -940,7 +940,7 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) if (config.antistream) { if (config.merge) { - logf(" Can't combine --antistream and --merge"); + msg(" Can't combine --antistream and --merge"); } tag = write_sprite_defines(tag, slave); tag = write_sprite(tag, slave, spriteid, replaceddefine); @@ -999,15 +999,15 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } } - logf(" move x (%d)", config.movex); - logf(" move y (%d)", config.movey); - logf(" scale x (%f)", config.scalex); - logf(" scale y (%f)", config.scaley); - logf(" master move x (%d)", config.mastermovex); - logf(" master move y (%d)", config.mastermovey); - logf(" master scale x (%f)", config.masterscalex); - logf(" master scale y (%f)", config.masterscaley); - logf(" is frame (%d)", config.isframe); + msg(" move x (%d)", config.movex); + msg(" move y (%d)", config.movey); + msg(" scale x (%f)", config.scalex); + msg(" scale y (%f)", config.scaley); + msg(" master move x (%d)", config.mastermovex); + msg(" master move y (%d)", config.mastermovey); + msg(" master scale x (%f)", config.masterscalex); + msg(" master scale y (%f)", config.masterscaley); + msg(" is frame (%d)", config.isframe); memset(masterbitmap, 0, sizeof(masterbitmap)); @@ -1054,42 +1054,42 @@ int main(int argn, char *argv[]) initLog(0,-1,0,0,-1,config.loglevel); if(config.merge && config.cat) { - logf(" Can't combine --cat and --merge"); + msg(" Can't combine --cat and --merge"); exit(1); } if(config.stack) { if(config.overlay) { - logf(" Can't combine -l and -t"); + msg(" Can't combine -l and -t"); exit(1); } if(config.clip) { - logf(" Can't combine -c and -t"); + msg(" Can't combine -c and -t"); exit(1); } - logf(" (stacking) %d files found\n", numslaves); + msg(" (stacking) %d files found\n", numslaves); makestackmaster(&master); } else { int ret; - logf(" master entity %s (named \"%s\")\n", master_filename, master_name); + msg(" master entity %s (named \"%s\")\n", master_filename, master_name); fi = open(master_filename, O_RDONLY|O_BINARY); if(fi<0) { - logf(" Failed to open %s\n", master_filename); + msg(" Failed to open %s\n", master_filename); exit(1); } ret = swf_ReadSWF(fi, &master); if(ret<0) { - logf(" Failed to read from %s\n", master_filename); + msg(" Failed to read from %s\n", master_filename); exit(1); } - logf(" Read %d bytes from masterfile\n", ret); + msg(" Read %d bytes from masterfile\n", ret); close(fi); } for(t=0;t slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], + msg(" slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], slave_isframe[t]?"frame":"object", slave_name[t]); } @@ -1097,7 +1097,7 @@ int main(int argn, char *argv[]) { if(numslaves) { - logf(" --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves); + msg(" --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves); exit(1); } numslaves = 1; @@ -1121,9 +1121,9 @@ int main(int argn, char *argv[]) if (!numslaves) { if(config.cat) - logf(" You must have at least two objects."); + msg(" You must have at least two objects."); else - logf(" You must have at least one slave entity."); + msg(" You must have at least one slave entity."); return 0; } for(t = 0; t < numslaves; t++) @@ -1134,22 +1134,22 @@ int main(int argn, char *argv[]) config.scaley = slave_scaley[t]; config.isframe = slave_isframe[t]; - logf(" Combine [%s]%s and [%s]%s", master_name, master_filename, + msg(" Combine [%s]%s and [%s]%s", master_name, master_filename, slave_name[t], slave_filename[t]); if(!config.dummy) { int ret; fi = open(slave_filename[t], O_RDONLY|O_BINARY); if(!fi) { - logf(" Failed to open %s\n", slave_filename[t]); + msg(" Failed to open %s\n", slave_filename[t]); exit(1); } ret = swf_ReadSWF(fi, &slave); if(ret<0) { - logf(" Failed to read from %s\n", slave_filename[t]); + msg(" Failed to read from %s\n", slave_filename[t]); exit(1); } - logf(" Read %d bytes from slavefile\n", ret); + msg(" Read %d bytes from slavefile\n", ret); close(fi); } else diff --git a/src/swfextract.c b/src/swfextract.c index b0cb511..723c599 100644 --- a/src/swfextract.c +++ b/src/swfextract.c @@ -676,11 +676,11 @@ void handlelossless(TAG*tag) // if(format == 5) cols = swf_GetU32(tag) + 1; else cols = 0; - logf(" Width %d", width); - logf(" Height %d", height); - logf(" Format %d", format); - logf(" Cols %d", cols); - logf(" Bpp %d", bpp); + msg(" Width %d", width); + msg(" Height %d", height); + msg(" Format %d", format); + msg(" Cols %d", cols); + msg(" Bpp %d", bpp); datalen = (width*height*bpp/8+cols*8); do { @@ -694,7 +694,7 @@ void handlelossless(TAG*tag) fprintf(stderr, "Zlib error %d (image %d)\n", error, id); return; } - logf(" Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols); + msg(" Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols); pos = 0; datalen2 = datalen; data2 = malloc(datalen2); @@ -774,7 +774,7 @@ void handlelossless(TAG*tag) fprintf(stderr, "zlib error in pic %d\n", id); return; } - logf(" Compressed data is %d bytes", datalen2); + msg(" Compressed data is %d bytes", datalen2); png_start_chunk(fi, "IDAT", datalen2); png_write_bytes(fi,data2,datalen2); png_end_chunk(fi); @@ -800,18 +800,18 @@ void handlesoundstream(TAG*tag) case ST_SOUNDSTREAMHEAD: if((tag->data[1]&0x30) == 0x20) { //mp3 compression mp3file = fopen(filename, "wb"); - logf(" Writing mp3 data to %s",filename); + msg(" Writing mp3 data to %s",filename); } else - logf(" Soundstream is not mp3"); + msg(" Soundstream is not mp3"); break; case ST_SOUNDSTREAMHEAD2: if((tag->data[1]&0x30) == 0x20) {//mp3 compression mp3file = fopen(filename, "wb"); - logf(" Writing mp3 data to %s",filename); + msg(" Writing mp3 data to %s",filename); } else - logf(" Soundstream is not mp3 (2)"); + msg(" Soundstream is not mp3 (2)"); break; case ST_SOUNDSTREAMBLOCK: if(mp3file) -- 1.7.10.4