swf_DeleteTag now takes two arguments

[swftools.git] / lib / modules / swfbits.c

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index eda6829..220fff4 100644 (file)
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -21,13 +21,29 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <memory.h>
+#include "../../config.h"
+#ifdef HAVE_ZLIB
+#include <zconf.h>
+#include <zlib.h>
+#endif
+#include <fcntl.h>
+#include <ctype.h>
+
+#ifdef HAVE_JPEGLIB
+#define HAVE_BOOLEAN
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "jpeglib.h"
+#include <jpeglib.h>
 #ifdef __cplusplus
 }
 #endif
+#endif // HAVE_JPEGLIB
+
+#include "../rfxswf.h"
 
 #define OUTBUFFER_SIZE 0x8000
 
@@ -1169,13 +1185,13 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
        tag1->prev = tag;
        if(tag) tag->next = tag1;
        tag = tag1;
-       swf_DeleteTag(tag2);
+       swf_DeleteTag(0, tag2);
     } else {
        /* use the jpeg version- it's smaller */
        tag2->prev = tag;
        if(tag) tag->next = tag2;
        tag = tag2;
-       swf_DeleteTag(tag1);
+       swf_DeleteTag(0, tag1);
     }
     return tag;
 }
@@ -1244,7 +1260,7 @@ void swf_RemoveJPEGTables(SWF * swf)
     }
     if (swf->firstTag == tables_tag)
        swf->firstTag = tables_tag->next;
-    swf_DeleteTag(tables_tag);
+    swf_DeleteTag(swf, tables_tag);
 }
 
 typedef struct scale_lookup {