From 14581c9e70e3050a01b464407dddd6e028e94572 Mon Sep 17 00:00:00 2001 From: kramm Date: Wed, 9 Jan 2002 11:19:14 +0000 Subject: [PATCH] more big endian fixes --- src/flash.c | 4 ++-- src/reloc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/flash.c b/src/flash.c index 627b101..3d1006c 100644 --- a/src/flash.c +++ b/src/flash.c @@ -514,14 +514,14 @@ int getidfromtag(struct swf_tag* tag) } break; case TAGID_REMOVEOBJECT: - return *(u16*)tag->data; + return SWAP16(*(u16*)tag->data); break; case TAGID_REMOVEOBJECT2: return -1; break; } - return *(u16*)tag->data; + return SWAP16(*(u16*)tag->data); } void setidintag(struct swf_tag* tag, int id) diff --git a/src/reloc.c b/src/reloc.c index e239675..294570e 100644 --- a/src/reloc.c +++ b/src/reloc.c @@ -19,10 +19,10 @@ void maponeid(void*idpos) { u16*idptr = (u16*)idpos; if(slaveids[SWAP16(*idptr)]<0) { - logf(" Trying to map id never encountered before: id=%d", *idptr); + logf(" Trying to map id never encountered before: id=%d", SWAP16(*idptr)); return ; } - logf(" mapping %d to %d", SWAP16(*idptr), slaveids[*idptr]); + logf(" mapping %d to %d", SWAP16(*idptr), slaveids[SWAP16(*idptr)]); *idptr = SWAP16(slaveids[*idptr]); } @@ -194,7 +194,7 @@ void map_ids_mem(u8*mem, int length, void(*callback)(void*)) u16 charid; if(!reader_readu8(&reader)) //flags break; - charid = *(u16*)reader_getinputpos(&reader); + charid = SWAP16(*(u16*)reader_getinputpos(&reader)); callback(reader_getinputpos(&reader)); reader_readu16(&reader); //char reader_readu16(&reader); //layer -- 1.7.10.4