removed crop box patch, use mediabox in pdftoppm

[swftools.git] / src / swfextract.c

diff --git a/src/swfextract.c b/src/swfextract.c
index 69f663a..1329416 100644 (file)
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -356,6 +356,7 @@ void extractTag(SWF*swf, char*filename)
        if(!originalplaceobjects && (extractids||extractname_id>=0)) {
             int number = 0;
             int id = 0;
+           int t;
             TAG* objtag = 0;
             SRECT bbox;
             memset(&bbox, 0, sizeof(SRECT));
@@ -367,6 +368,7 @@ void extractTag(SWF*swf, char*filename)
             }
             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 */
@@ -379,11 +381,15 @@ void extractTag(SWF*swf, char*filename)
                     }
                     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;
+           }
 
-           int t;
-           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);
@@ -403,7 +409,7 @@ void extractTag(SWF*swf, char*filename)
                                 m.sx = (512*20*65536)/max;
                                 m.sy = (512*20*65536)/max;
                             }
-                            newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
+                            //newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
                         }
                        swf_ObjectPlace(desttag, t, t, &m,0,0);
                    }
@@ -457,6 +463,8 @@ void listObjects(SWF*swf)
     int t;
     int frame = 0;
     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++) {
@@ -466,6 +474,8 @@ void listObjects(SWF*swf)
        tag = swf->firstTag;
        first = 1;
        while(tag) {
+           if(tag->id == ST_SOUNDSTREAMHEAD || tag->id == ST_SOUNDSTREAMHEAD2)
+               mp3 = 1;
            if(isOfType(t,tag))
                nr++;
            tag = tag->next;
@@ -473,7 +483,7 @@ void listObjects(SWF*swf)
        if(!nr)
            continue;
        
-       printf(" %d %s%s: ID(s) ", nr, names[t], nr>1?"s":"");
+       printf(" [%s] %d %s%s: ID(s) ", options[t], nr, names[t], nr>1?"s":"");
 
        tag = swf->firstTag;
        while(tag) {
@@ -516,9 +526,12 @@ void listObjects(SWF*swf)
     }
 
     if(frame)
-       printf(" %d Frames: ID(s) 0-%d\n", frame, frame);
+       printf(" [-f] %d Frames: ID(s) 0-%d\n", frame, frame);
     else
-       printf(" 1 Frame: ID(s) 0\n");
+       printf(" [-f] 1 Frame: ID(s) 0\n");
+
+    if(mp3)
+       printf(" [-m] 1 MP3 Soundstream\n");
 }
 
 void handlefont(SWF*swf, TAG*tag)
@@ -823,12 +836,21 @@ void handlelossless(TAG*tag)
             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++)
        {