X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmodules%2Fswftools.c;h=b192f338b3b29fe5ddef6ff21c558c2cdd70a6ef;hb=6d22f1376c2fcad7c872db608630468d3abcca23;hp=e3d20eeb6ea89a3d949cf9d485d0770fd7ffd6ce;hpb=dfc81d564ff8df06a3fb5635d77a2b9a31afde7b;p=swftools.git

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index e3d20ee..b192f33 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -560,7 +560,7 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 		if(id == ST_END)
 		    break;
 		tag2->len = tag2->memsize = len;
-		tag2->data = rfx_alloc(len);
+		tag2->data = malloc(len);
 		memcpy(tag2->data, &tag->data[tag->pos], len);
 		/* I never saw recursive sprites, but they are (theoretically) 
 		   possible, so better add base here again */
@@ -844,7 +844,7 @@ void swf_Relocate (SWF*swf, char*bitmap)
 	} 
 	
 	num = swf_GetNumUsedIDs(tag);
-	ptr = rfx_alloc(sizeof(int)*num);
+	ptr = malloc(sizeof(int)*num);
 	swf_GetUsedIDs(tag, ptr);
 
 	for(t=0;t<num;t++) {
@@ -970,11 +970,14 @@ static int tagHash(TAG*tag)
 void swf_Optimize(SWF*swf)
 {
     const int hash_size = 131072;
-    char* dontremap = rfx_calloc(sizeof(char)*65536);
-    U16* remap = rfx_alloc(sizeof(U16)*65536);
-    TAG* id2tag = rfx_calloc(sizeof(TAG*)*65536);
-    TAG** hashmap = rfx_calloc(sizeof(TAG*)*hash_size);
+    char* dontremap = malloc(sizeof(char)*65536);
+    U16* remap = malloc(sizeof(U16)*65536);
+    TAG* id2tag = malloc(sizeof(TAG*)*65536);
+    TAG** hashmap = malloc(sizeof(TAG*)*hash_size);
     TAG* tag;
+    memset(dontremap, 0, sizeof(char)*65536);
+    memset(hashmap, 0, sizeof(TAG*)*hash_size);
+    memset(id2tag, 0, sizeof(TAG*)*65536);
     int t;
     for(t=0;t<65536;t++) {
         remap[t] = t;
@@ -1051,7 +1054,7 @@ void swf_Optimize(SWF*swf)
         if(doremap)
         {
             int num = swf_GetNumUsedIDs(tag);
-            int*positions = rfx_alloc(sizeof(int)*num);
+            int*positions = malloc(sizeof(int)*num);
             int t;
             swf_GetUsedIDs(tag, positions);
             for(t=0;t<num;t++) {
@@ -1059,14 +1062,14 @@ void swf_Optimize(SWF*swf)
                 id = remap[id];
                 PUT16(&tag->data[positions[t]], id);
             }
-            rfx_free(positions);
+            free(positions);
             tag = tag->next;
         }
 
         tag = next;
     }
-    rfx_free(dontremap);
-    rfx_free(remap);
-    rfx_free(id2tag);
-    rfx_free(hashmap);
+    free(dontremap);
+    free(remap);
+    free(id2tag);
+    free(hashmap);
 }