Part of the swftools package.
Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
- This file is distributed under the GPL, see file COPYING for details */
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <unistd.h>
#include <stdio.h>
char* extractfontids = 0;
char* extractpngids = 0;
char* extractsoundids = 0;
+char* extractbinaryids = 0;
char extractmp3 = 0;
char* extractname = 0;
char hollow = 0;
char originalplaceobjects = 0;
+char movetozero = 0;
int numextracts = 0;
{"j","jpegs"},
{"p","pngs"},
{"P","placeobject"},
+ {"0","movetozero"},
{"m","mp3"},
{"s","sound"},
{"n","name"},
{"f","frame"},
{"F","font"},
{"V","version"},
+ {"b","binary"},
{0,0}
};
fprintf(stderr, "Only one --jpegs argument is allowed. (Try to use a range, e.g. -j 1,2,3)\n");
exit(1);
}
+ /* TODO: count number of IDs in val range */
numextracts++;
extractjpegids = val;
return 1;
extractsoundids = val;
return 1;
}
+ else if(!strcmp(name, "b")) {
+ if(extractbinaryids) {
+ fprintf(stderr, "Only one --binary argument is allowed. (Try to use a range, e.g. -s 1,2,3)\n");
+ exit(1);
+ }
+ numextracts++;
+ extractbinaryids = val;
+ return 1;
+ }
#ifdef _ZLIB_INCLUDED_
else if(!strcmp(name, "p")) {
if(extractpngids) {
originalplaceobjects = 1;
return 0;
}
+ else if(!strcmp(name, "0")) {
+ movetozero = 1;
+ return 0;
+ }
else if(!strcmp(name, "w")) {
hollow = 1;
return 0;
callback(&tag->data[ptr[t]]);
}
+void moveToZero(TAG*tag)
+{
+ if(!swf_isPlaceTag(tag))
+ return;
+ SWFPLACEOBJECT obj;
+ swf_GetPlaceObject(tag, &obj);
+ obj.matrix.tx = 0;
+ obj.matrix.ty = 0;
+ swf_ResetTag(tag, tag->id);
+ swf_SetPlaceObject(tag, &obj);
+}
+
void extractTag(SWF*swf, char*filename)
{
SWF newswf;
newswf.fileVersion = swf->fileVersion;
newswf.frameRate = swf->frameRate;
newswf.movieSize = swf->movieSize;
+ if(movetozero && originalplaceobjects) {
+ newswf.movieSize.xmax = swf->movieSize.xmax - swf->movieSize.xmin;
+ newswf.movieSize.ymax = swf->movieSize.ymax - swf->movieSize.ymin;
+ newswf.movieSize.xmin = 0;
+ newswf.movieSize.ymin = 0;
+ }
newswf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
desttag = newswf.firstTag;
changed = 0;
for(t=0;t<65536;t++) {
if(used[t] && !(used[t]&2)) {
- if(tags[t]->id==ST_DEFINESPRITE) {
+ if(tags[t]==0) {
+ msg("<warning> ID %d is referenced, but never defined.", t);
+ } else if(tags[t]->id==ST_DEFINESPRITE) {
TAG*tag = tags[t];
while(tag->id != ST_END)
{
}
if(srctag->id == ST_DEFINESPRITE)
sprite = 1;
+ if(srctag->id == ST_JPEGTABLES)
+ copy = 1;
if(swf_isDefiningTag(srctag)) {
int id = swf_GetDefineID(srctag);
if(used[id]) {
swf_ExpandRect2(&objectbbox, &b);
}
} else
- if (((((srctag->id == ST_PLACEOBJECT || srctag->id == ST_PLACEOBJECT2) && originalplaceobjects)
+ if ((((swf_isPlaceTag(srctag) && originalplaceobjects)
|| srctag->id == ST_STARTSOUND) && (used[swf_GetPlaceID(srctag)]&4) ) ||
(swf_isPseudoDefiningTag(srctag) && used[swf_GetDefineID(srctag)]) ||
(tagused[tagnum]))
desttag->len = desttag->memsize = srctag->len;
desttag->data = malloc(srctag->len);
memcpy(desttag->data, srctag->data, srctag->len);
+ if(movetozero && swf_isPlaceTag(desttag)) {
+ moveToZero(desttag);
+ }
if(reset)
copy = 0;
}
}
if(!extractframes && !hollow) {
if(!originalplaceobjects && (extractids||extractname_id>=0)) {
+ int number = 0;
+ int id = 0;
int t;
- int s=0;
- if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0)
- newswf.movieSize = objectbbox;
+ TAG* objtag = 0;
+ SRECT bbox;
+ memset(&bbox, 0, sizeof(SRECT));
+ if(extractids) {
+ for(t=0;t<65536;t++) {
+ if(is_in_range(t, extractids)) {
+ id = t;
+ number++;
+ }
+ }
+ }
+ if(number>=2) {
+ printf("warning! You should use the -P when extracting multiple objects\n");
+ }
+
+ if(number == 1) {
+ /* if there is only one object, we will scale it.
+ So let's figure out its bounding box */
+ TAG*tag = swf->firstTag;
+ while(tag) {
+ if(swf_isDefiningTag(tag) && tag->id != ST_DEFINESPRITE) {
+ if(swf_GetDefineID(tag) == id)
+ bbox = swf_GetDefineBBox(tag);
+ objtag = tag;
+ }
+ tag = tag->next;
+ }
+ newswf.movieSize.xmin = 0;
+ newswf.movieSize.ymin = 0;
+ newswf.movieSize.xmax = 512*20;
+ newswf.movieSize.ymax = 512*20;
+ } else {
+ if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0)
+ newswf.movieSize = objectbbox;
+ }
+
if(extractname_id>=0) {
desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2);
swf_ObjectPlace(desttag, extractname_id, extractname_id, 0,0,extractname);
} else {
for(t=0;t<65536;t++) {
if(is_in_range(t, extractids)) {
+ MATRIX m;
desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2);
- swf_ObjectPlace(desttag, t, t, 0,0,0);
- s++;
- if(s==2)
- printf("warning! You should use the -P when extracting multiple objects\n");
+ swf_GetMatrix(0, &m);
+ if(objtag) {
+ int width = bbox.xmax - bbox.xmin;
+ int height = bbox.ymax - bbox.ymin;
+ int max = width>height?width:height;
+ m.tx = -bbox.xmin;
+ m.ty = -bbox.ymin;
+ if(max) {
+ m.sx = (512*20*65536)/max;
+ m.sy = (512*20*65536)/max;
+ }
+ //newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
+ }
+ swf_ObjectPlace(desttag, t, t, &m,0,0);
}
}
}
swf_FreeTags(&newswf); // cleanup
}
+int isOfType(int t, TAG*tag)
+{
+ int show = 0;
+ if(t == 0 && (tag->id == ST_DEFINESHAPE ||
+ tag->id == ST_DEFINESHAPE2 ||
+ tag->id == ST_DEFINESHAPE3)) {
+ show = 1;
+ }
+ if(t==1 && tag->id == ST_DEFINESPRITE) {
+ show = 1;
+ }
+ if(t == 2 && (tag->id == ST_DEFINEBITS ||
+ tag->id == ST_DEFINEBITSJPEG2 ||
+ tag->id == ST_DEFINEBITSJPEG3)) {
+ show = 1;
+ }
+ if(t == 3 && (tag->id == ST_DEFINEBITSLOSSLESS ||
+ tag->id == ST_DEFINEBITSLOSSLESS2)) {
+ show = 1;
+ }
+ if(t == 4 && (tag->id == ST_DEFINESOUND)) {
+ show = 1;
+ }
+ if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3)) {
+ show = 1;
+ }
+ if (t== 6 && (tag->id == ST_DEFINEBINARY)) {
+ show = 1;
+ }
+ return show;
+}
+
void listObjects(SWF*swf)
{
TAG*tag;
char first;
int t;
int frame = 0;
- char*names[] = {"Shapes","MovieClips","JPEGs","PNGs","Sounds","Fonts"};
+ char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font", "Binary"};
+ char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F","-b"};
+ int mp3=0;
printf("Objects in file %s:\n",filename);
+ swf_FoldAll(swf);
for(t=0;t<sizeof(names)/sizeof(names[0]);t++) {
+ int nr=0;
+ int lastid = -2, lastprint=-1;
+ int follow=0;
tag = swf->firstTag;
first = 1;
while(tag) {
- char show = 0;
+ if(tag->id == ST_SOUNDSTREAMHEAD || tag->id == ST_SOUNDSTREAMHEAD2)
+ mp3 = 1;
+ if(isOfType(t,tag))
+ nr++;
+ tag = tag->next;
+ }
+ if(!nr)
+ continue;
+
+ printf(" [%s] %d %s%s: ID(s) ", options[t], nr, names[t], nr>1?"s":"");
+
+ tag = swf->firstTag;
+ while(tag) {
char text[80];
- if(t == 0 &&
- (tag->id == ST_DEFINESHAPE ||
- tag->id == ST_DEFINESHAPE2 ||
- tag->id == ST_DEFINESHAPE3)) {
- show = 1;
- sprintf(text,"%d", swf_GetDefineID(tag));
+ char show = isOfType(t,tag);
+ int id;
+ if(!show) {
+ tag = tag->next;
+ continue;
}
+ id = swf_GetDefineID(tag);
- if(tag->id == ST_DEFINESPRITE) {
- if (t == 1) {
- show = 1;
- sprintf(text,"%d", swf_GetDefineID(tag));
+ if(id == lastid+1) {
+ follow=1;
+ } else {
+ if(first || !follow) {
+ if(!first)
+ printf(", ");
+ printf("%d", id);
+ } else {
+ if(lastprint + 1 == lastid)
+ printf(", %d, %d", lastid, id);
+ else
+ printf("-%d, %d", lastid, id);
}
-
- while(tag->id != ST_END)
- tag = tag->next;
- }
-
- if(t == 2 && (tag->id == ST_DEFINEBITS ||
- tag->id == ST_DEFINEBITSJPEG2 ||
- tag->id == ST_DEFINEBITSJPEG3)) {
- show = 1;
- sprintf(text,"%d", swf_GetDefineID(tag));
- }
-
- if(t == 3 && (tag->id == ST_DEFINEBITSLOSSLESS ||
- tag->id == ST_DEFINEBITSLOSSLESS2)) {
- show = 1;
- sprintf(text,"%d", swf_GetDefineID(tag));
- }
-
-
- if(t == 4 && (tag->id == ST_DEFINESOUND)) {
- show = 1;
- sprintf(text,"%d", swf_GetDefineID(tag));
- }
-
- if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2)) {
- show = 1;
- sprintf(text,"%d", swf_GetDefineID(tag));
- }
-
- if(show) {
- if(!first)
- printf(", ");
- else
- printf("%s: ", names[t]);
- printf("%s", text);
+ lastprint = id;
first = 0;
+ follow = 0;
}
+ lastid = id;
tag=tag->next;
}
- if(!first)
- printf("\n");
+ if(follow) {
+ if(lastprint + 1 == lastid)
+ printf(", %d", lastid);
+ else
+ printf("-%d", lastid);
+ }
+ printf("\n");
}
if(frame)
- printf("Frames: 0-%d\n", frame);
+ printf(" [-f] %d Frames: ID(s) 0-%d\n", frame, frame);
else
- printf("Frames: 0\n");
+ printf(" [-f] 1 Frame: ID(s) 0\n");
+
+ if(mp3)
+ printf(" [-m] 1 MP3 Soundstream\n");
}
void handlefont(SWF*swf, TAG*tag)
printf("Couldn't extract font %d\n", id);
return;
}
- if(!f->layout)
- swf_FontCreateLayout(f);
swf_WriteFont(f, filename);
swf_FontFree(f);
}
-U8*jpegtables = 0;
-int jpegtablessize;
+static char has_jpegtables=0;
+static U8*jpegtables = 0;
+static int jpegtablessize = 0;
void handlejpegtables(TAG*tag)
{
if(tag->id == ST_JPEGTABLES) {
jpegtables = tag->data;
jpegtablessize = tag->len;
+ has_jpegtables = 1;
}
}
{
int t;
int pos=-1;
- for(t=0;t<len;t++) {
+ for(t=0;t<len-4;t++) {
if(data[t ]==0xff &&
data[t+1]==0xd9 &&
data[t+2]==0xff &&
/* swf jpeg images have two streams, which both start with ff d8 and
end with ff d9. The following code handles sorting the middle
<ff d9 ff d8> bytes out, so that one stream remains */
- if(tag->id == ST_DEFINEBITS && tag->len>2 && jpegtables) {
+ if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && has_jpegtables) {
fi = save_fopen(filename, "wb");
- fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
- fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+ if(jpegtablessize>=2) {
+ fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
+ fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+ } else {
+ fwrite(tag->data+2, tag->len-2, 1, fi);
+ }
fclose(fi);
}
else if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
int end = tag->len;
int pos = findjpegboundary(&tag->data[2], tag->len-2);
- if(pos<0)
- return;
- pos+=2;
- fi = save_fopen(filename, "wb");
- fwrite(&tag->data[2], pos-2, 1, fi);
- fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
- fclose(fi);
+ if(pos>=0) {
+ pos+=2;
+ fi = save_fopen(filename, "wb");
+ fwrite(&tag->data[2], pos-2, 1, fi);
+ fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
+ fclose(fi);
+ } else {
+ fi = save_fopen(filename, "wb");
+ fwrite(&tag->data[2], end-2, 1, fi);
+ fclose(fi);
+ }
}
else if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
U32 end = GET32(&tag->data[2])+6;
int pos = findjpegboundary(&tag->data[6], tag->len-6);
- if(pos<0)
- return;
- pos+=6;
- fi = save_fopen(filename, "wb");
- fwrite(&tag->data[6], pos-6, 1, fi);
- fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
- fclose(fi);
+ if(pos<0) {
+ fi = save_fopen(filename, "wb");
+ fwrite(&tag->data[6], end-6, 1, fi);
+ fclose(fi);
+ } else {
+ pos+=6;
+ fi = save_fopen(filename, "wb");
+ fwrite(&tag->data[6], pos-6, 1, fi);
+ fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
+ fclose(fi);
+ }
}
else {
int id = GET16(tag->data);
- fprintf(stderr, "Object %d is not a JPEG picture!\n",id);
+ fprintf(stderr, "Object %d is not a JPEG picture!\n", id);
exit(1);
}
}
crc32_table[t] = c;
}
}
-static void png_write_byte(FILE*fi, U8 byte)
+static inline void png_write_byte(FILE*fi, U8 byte)
{
fwrite(&byte,1,1,fi);
mycrc32 = crc32_table[(mycrc32 ^ byte) & 0xff] ^ (mycrc32 >> 8);
U8 bpp = 1;
U8 format;
U8 tmp;
- U8* data=0;
+ Bytef* data=0;
U8* data2=0;
U8* data3=0;
- U32 datalen;
- U32 datalen2;
+ uLongf datalen;
+ uLongf datalen2;
U32 datalen3;
U8 head[] = {137,80,78,71,13,10,26,10};
int cols;
// if(format == 5) cols = swf_GetU32(tag) + 1;
else cols = 0;
- logf("<verbose> Width %d", width);
- logf("<verbose> Height %d", height);
- logf("<verbose> Format %d", format);
- logf("<verbose> Cols %d", cols);
- logf("<verbose> Bpp %d", bpp);
+ msg("<verbose> Width %d", width);
+ msg("<verbose> Height %d", height);
+ msg("<verbose> Format %d", format);
+ msg("<verbose> Cols %d", cols);
+ msg("<verbose> Bpp %d", bpp);
datalen = (width*height*bpp/8+cols*8);
do {
fprintf(stderr, "Zlib error %d (image %d)\n", error, id);
return;
}
- logf("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
+ msg("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
pos = 0;
- datalen2 = datalen;
+ datalen2 = datalen+16;
data2 = malloc(datalen2);
palette = (RGBA*)malloc(cols*sizeof(RGBA));
png_write_byte(fi,8);
if(format == 3)
png_write_byte(fi,3); //indexed
- else if(format == 5)
+ else if(format == 5 && alpha==0)
png_write_byte(fi,2); //rgb
+ else if(format == 5 && alpha==1)
+ png_write_byte(fi,6); //rgba
else return;
png_write_byte(fi,0); //compression mode
if(format == 3) {
png_start_chunk(fi, "PLTE", 768);
+
for(t=0;t<256;t++) {
png_write_byte(fi,palette[t].r);
png_write_byte(fi,palette[t].g);
png_write_byte(fi,palette[t].b);
}
png_end_chunk(fi);
+
+ if(alpha) {
+ /* write alpha palette */
+ png_start_chunk(fi, "tRNS", 256);
+ for(t=0;t<256;t++) {
+ png_write_byte(fi,palette[t].a);
+ }
+ png_end_chunk(fi);
+ }
}
{
int pos2 = 0;
int x,y;
int srcwidth = width * (bpp/8);
- datalen3 = width*height*4;
+ datalen3 = (width*4+5)*height;
data3 = (U8*)malloc(datalen3);
for(y=0;y<height;y++)
{
data3[pos2++]=0; //filter type
if(bpp==32) {
- // 32 bit to 24 bit "conversion"
- for(x=0;x<width;x++) {
- data3[pos2++]=data[pos+1];
- data3[pos2++]=data[pos+2];
- data3[pos2++]=data[pos+3];
- pos+=4; //ignore padding byte
+ if(!alpha) {
+ // 32 bit to 24 bit "conversion"
+ for(x=0;x<width;x++) {
+ data3[pos2++]=data[pos+1];
+ data3[pos2++]=data[pos+2];
+ data3[pos2++]=data[pos+3];
+ pos+=4; //ignore padding byte
+ }
+ } else {
+ for(x=0;x<width;x++) {
+ data3[pos2++]=data[pos+1];
+ data3[pos2++]=data[pos+2];
+ data3[pos2++]=data[pos+3];
+ data3[pos2++]=data[pos+0]; //alpha
+ pos+=4;
+ }
}
}
else {
fprintf(stderr, "zlib error in pic %d\n", id);
return;
}
- logf("<verbose> Compressed data is %d bytes", datalen2);
+ msg("<verbose> Compressed data is %d bytes", datalen2);
png_start_chunk(fi, "IDAT", datalen2);
png_write_bytes(fi,data2,datalen2);
png_end_chunk(fi);
}
#endif
-FILE*mp3file;
+static FILE*mp3file=0;
void handlesoundstream(TAG*tag)
{
char*filename = "output.mp3";
case ST_SOUNDSTREAMHEAD:
if((tag->data[1]&0x30) == 0x20) { //mp3 compression
mp3file = fopen(filename, "wb");
- logf("<notice> Writing mp3 data to %s",filename);
+ msg("<notice> Writing mp3 data to %s",filename);
}
else
- logf("<error> Soundstream is not mp3");
+ msg("<error> Soundstream is not mp3");
break;
case ST_SOUNDSTREAMHEAD2:
if((tag->data[1]&0x30) == 0x20) {//mp3 compression
mp3file = fopen(filename, "wb");
- logf("<notice> Writing mp3 data to %s",filename);
+ msg("<notice> Writing mp3 data to %s",filename);
}
else
- logf("<error> Soundstream is not mp3 (2)");
+ msg("<error> Soundstream is not mp3 (2)");
break;
case ST_SOUNDSTREAMBLOCK:
if(mp3file)
char buf[128];
char*filename = buf;
FILE*fi;
+ char*extension = 0;
+ int format;
U16 id;
+ int rate,bits,stereo;
+ char*rates[] = {"5500","11025","22050","44100"};
id = swf_GetU16(tag); //id
- sprintf(buf, "sound%d.mp3", id);
+
+ flags = swf_GetU8(tag);
+ format = flags>>4;
+ rate = (flags>>2)&3;
+ bits = flags&2?16:8;
+ stereo = flags&1;
+
+ samples = swf_GetU32(tag);
+ extension = "raw";
+
+ if(format == 2) { // mp3
+ swf_GetU16(tag); //numsamples_seek
+ extension = "mp3";
+ } else if(format == 0) { // raw
+ printf("Sound is RAW, format: %s samples/sec, %d bit, %s\n", rates[rate], bits, stereo?"stereo":"mono");
+ // TODO: convert to WAV
+ extension = "raw";
+ } else if(format == 1) { // adpcm
+ printf("Sound is ADPCM, format: %s samples/sec, %d bit, %s\n", rates[rate], bits, stereo?"stereo":"mono");
+ extension = "adpcm";
+ }
+ sprintf(buf, "sound%d.%s", id, extension);
if(numextracts==1) {
filename = destfilename;
- if(!strcmp(filename,"output.swf"))
- filename = "output.mp3";
- }
- flags = swf_GetU8(tag);
- if((flags>>4)!=2) {
- printf("Sorry, can only extract MP3 sounds. Sound %d is ADPCM or RAW.\n", id);
- /* not mp3 */
- return;
+ if(!strcmp(filename,"output.swf")) {
+ sprintf(buf, "output.%s", extension);
+ filename = buf;
+ }
}
- samples = swf_GetU32(tag);
-
- swf_GetU16(tag); //(only for mp3) numsamples_seek
-
fi = save_fopen(filename, "wb");
fwrite(&tag->data[tag->pos], tag->len - tag->pos, 1, fi);
fclose(fi);
}
+void handlebinary(TAG*tag) {
+ FILE *fout = NULL;
+ char buf[100];
+ char *filename = buf;
+ int len = tag->memsize;
+ int dx = 6; // offset to binary data
+ if (tag->id!=ST_DEFINEBINARY) {
+ fprintf(stderr, "Object %d is not a binary entity!\n",
+ GET16(tag->data));
+ return;
+ }
+ sprintf(buf, "binary%d.bin", GET16(tag->data));
+ if(numextracts==1) {
+ filename = destfilename;
+ if(!strcmp(filename,"output.swf")) {
+ sprintf(buf, "output.bin");
+ filename = buf;
+ }
+ }
+ fout = fopen(filename, "wb");
+ fwrite(tag->data+dx,len-dx,1,fout);
+ fclose(fout);
+}
+
int main (int argc,char ** argv)
{
TAG*tag;
processargs(argc, argv);
if(!extractframes && !extractids && ! extractname && !extractjpegids && !extractpngids
- && !extractmp3 && !extractsoundids && !extractfontids)
+ && !extractmp3 && !extractsoundids && !extractfontids && !extractbinaryids)
listavailable = 1;
+ if(!originalplaceobjects && movetozero) {
+ fprintf(stderr, "Error: -0 (--movetozero) can only be used in conjunction with -P (--placeobject)\n");
+ return 0;
+ }
+
if(!filename)
{
fprintf(stderr, "You must supply a filename.\n");
handlesoundstream(tag);
}
- if(tag->id == ST_JPEGTABLES)
+ if(tag->id == ST_JPEGTABLES) {
handlejpegtables(tag);
+ }
if(swf_isDefiningTag(tag)) {
int id = swf_GetDefineID(tag);
if(extractsoundids && is_in_range(id, extractsoundids)) {
handledefinesound(tag);
}
+ if(extractbinaryids && is_in_range(id, extractbinaryids)) {
+ handlebinary(tag);
+ }
#ifdef _ZLIB_INCLUDED_
if(extractpngids && is_in_range(id, extractpngids)) {
handlelossless(tag);
maing = tag->data[1];
mainb = tag->data[2];
}
- else if(tag->id == ST_PLACEOBJECT2) {
+ else if(swf_isPlaceTag(tag) && tag->id != ST_PLACEOBJECT ) {
char*name = swf_GetName(tag);
if(name && extractname && !strcmp(name, extractname)) {
int id = swf_GetPlaceID(tag);
used[id] = 5;
found = 1;
- tagused[tagnum] = 1;
+ if(originalplaceobjects) {
+ tagused[tagnum] = 1;
+ }
depths[swf_GetDepth(tag)] = 1;
extractname_id = id;
}
if (found)
extractTag(&swf, destfilename);
- if(mp3file)
+ if(mp3file) {
fclose(mp3file);
+ } else {
+ if(extractmp3) {
+ msg("<error> Didn't find a soundstream in file");
+ }
+ }
swf_FreeTags(&swf);
return 0;
git.asbjorn.biz / swftools.git / blobdiff