added handling for jpegtables.

[swftools.git] / src / combine.c

diff --git a/src/combine.c b/src/combine.c
index 10b8efc..9530bb7 100644 (file)
--- a/src/combine.c
+++ b/src/combine.c
@@ -157,8 +157,15 @@ void write_sprite_defines(struct writer_t*w)
                         * Anyway we can't throw it out, so we just pass it
                         * through.
                         */
+                       writer_write(w, tag->fulldata, tag->fulllength);
                        break;
                    }
+                case TAGID_JPEGTABLES:
+                       /* according to the flash specs, there may only 
+                          be one JPEGTABLES tag per swf. This is maybe
+                          a big FIXME */
+                       writer_write(w, tag->fulldata, tag->fulllength);
+                   break;
                 case TAGID_EXPORTASSETS:
                    logf("<debug> deliberately ignoring EXPORTASSETS tag");
                    break;
@@ -358,6 +365,9 @@ uchar * combine(uchar*masterdata, int masterlength, char*_slavename, uchar*slave
        logf("<notice> the master file is flash (swf) format\n");
        master_flash = 1;
     }
+    else
+       logf("<notice> the master file is not flash (swf) format!\n");
+
     if(slavedata[2] == 'S' &&
        slavedata[1] == 'W' &&
        slavedata[0] == 'F')
@@ -365,6 +375,8 @@ uchar * combine(uchar*masterdata, int masterlength, char*_slavename, uchar*slave
        logf("<notice> the slave file is flash (swf) format\n");
        slave_flash = 1;
     }
+    else
+       logf("<notice> the slave file is not flash (swf) format!\n");
 
     if(master_flash && slave_flash)
     {