}
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));
+ 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 it's 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)) {
+ 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"};
+ char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F"};
+ 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)
/* 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 && 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)
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;
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++)
{
samples = swf_GetU32(tag);
+ extension = "raw";
+
if(format == 2) { // mp3
swf_GetU16(tag); //numsamples_seek
extension = "mp3";
git.asbjorn.biz / swftools.git / blobdiff