solaris fixes.

[swftools.git] / src / swfextract.c

diff --git a/src/swfextract.c b/src/swfextract.c
index 62b6168..99844eb 100644 (file)
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -152,9 +152,9 @@ char * tagused;
 
 void idcallback(void*data)
 {
-    if(!(used[SWAP16(*(U16*)data)]&1)) {
+    if(!(used[GET16(data)]&1)) {
        changed = 1;
-       used[SWAP16(*(U16*)data)] |= 1;
+       used[GET16(data)] |= 1;
     }
 }
 
@@ -165,7 +165,7 @@ void enumerateIDs(TAG*tag, void(*callback)(void*))
     if(tag->len>=64) {
        len += 6;
        data = (U8*)malloc(len);
-       *(U16*)data = SWAP16((tag->id<<6)+63);
+       PUT16(data, (tag->id<<6)+63);
        *(U8*)&data[2] = tag->len;
        *(U8*)&data[3] = tag->len>>8;
        *(U8*)&data[4] = tag->len>>16;
@@ -174,7 +174,7 @@ void enumerateIDs(TAG*tag, void(*callback)(void*))
     } else {
        len += 2;
        data = (U8*)malloc(len);
-       *(U16*)data = SWAP16((tag->id<<6)+tag->len);
+       PUT16(data, (tag->id<<6)+tag->len);
        memcpy(&data[2], tag->data, tag->len);
     }
     map_ids_mem(data, len, callback);
@@ -395,7 +395,7 @@ void handlejpeg(TAG*tag)
 {
     char name[80];
     FILE*fi;
-    sprintf(name, "pic%d.jpeg", SWAP16(*(U16*)tag->data));
+    sprintf(name, "pic%d.jpeg", GET16(tag->data));
     /* 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 */
@@ -417,7 +417,7 @@ void handlejpeg(TAG*tag)
        fclose(fi);
     }
     if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
-       U32 end = SWAP32(*(U32*)&tag->data[2])+6;
+       U32 end = GET32(&tag->data[2])+6;
        int pos = findjpegboundary(&tag->data[6], tag->len-6);
        if(pos<0)
            return;