git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only create a unicode2glyph table if explicitly requested
[swftools.git]
/
lib
/
rfxswf.c
diff --git
a/lib/rfxswf.c
b/lib/rfxswf.c
index
025bcaf
..
6570847
100644
(file)
--- a/
lib/rfxswf.c
+++ b/
lib/rfxswf.c
@@
-474,6
+474,28
@@
void swf_SetF16(TAG * t, float f)
swf_SetU16(t, result);
}
swf_SetU16(t, result);
}
+float F16toFloat(U16 x)
+{
+ TAG t;
+ t.data = (void*)&x;
+ t.readBit = 0;
+ t.pos = 0;
+ t.len = 2;
+ return swf_GetF16(&t);
+}
+
+float floatToF16(float f)
+{
+ U16 u = 0;
+ TAG t;
+ t.data = (void*)&u;
+ t.len = 0;
+ t.memsize = 2;
+ t.writeBit = 0;
+ swf_SetF16(&t, f);
+ return u;
+}
+
double swf_GetD64(TAG*tag)
{
/* FIXME: this is not big-endian compatible */
double swf_GetD64(TAG*tag)
{
/* FIXME: this is not big-endian compatible */
@@
-1157,15
+1179,14
@@
TAG * swf_ReadTag(reader_t*reader, TAG * prev)
int id;
if (reader->read(reader, &raw, 2) !=2 ) return NULL;
int id;
if (reader->read(reader, &raw, 2) !=2 ) return NULL;
- raw = SWAP16(raw);
+ raw = LE_16_TO_NATIVE(raw);
len = raw&0x3f;
id = raw>>6;
if (len==0x3f)
{
len = raw&0x3f;
id = raw>>6;
if (len==0x3f)
{
- if (reader->read(reader, &len, 4) != 4) return NULL;
- len = SWAP32(len);
+ len = reader_readU32(reader);
}
if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
}
if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
@@
-1222,7
+1243,7
@@
int swf_WriteTag2(writer_t*writer, TAG * t)
#endif
if (short_tag)
#endif
if (short_tag)
- { raw[0] = SWAP16(len|((t->id&0x3ff)<<6));
+ { raw[0] = LE_16_TO_NATIVE(len|((t->id&0x3ff)<<6));
if (writer->write(writer,raw,2)!=2)
{
#ifdef DEBUG_RFXSWF
if (writer->write(writer,raw,2)!=2)
{
#ifdef DEBUG_RFXSWF
@@
-1233,7
+1254,7
@@
int swf_WriteTag2(writer_t*writer, TAG * t)
}
else
{
}
else
{
- raw[0] = SWAP16((t->id<<6)|0x3f);
+ raw[0] = LE_16_TO_NATIVE((t->id<<6)|0x3f);
if (writer->write(writer,raw,2)!=2)
{
#ifdef DEBUG_RFXSWF
if (writer->write(writer,raw,2)!=2)
{
#ifdef DEBUG_RFXSWF
@@
-1242,14
+1263,7
@@
int swf_WriteTag2(writer_t*writer, TAG * t)
return -1;
}
return -1;
}
- len = SWAP32(len);
- if (writer->write(writer,&len,4)!=4)
- {
- #ifdef DEBUG_RFXSWF
- fprintf(stderr,"WriteTag() failed: Long Header (2).\n");
- #endif
- return -1;
- }
+ writer_writeU32(writer, len);
}
if (t->data)
}
if (t->data)
@@
-1545,9
+1559,9
@@
int swf_ReadSWF2(reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed
reader_GetRect(reader, &swf->movieSize);
reader->read(reader, &swf->frameRate, 2);
reader_GetRect(reader, &swf->movieSize);
reader->read(reader, &swf->frameRate, 2);
- swf->frameRate = SWAP16(swf->frameRate);
+ swf->frameRate = LE_16_TO_NATIVE(swf->frameRate);
reader->read(reader, &swf->frameCount, 2);
reader->read(reader, &swf->frameCount, 2);
- swf->frameCount = SWAP16(swf->frameCount);
+ swf->frameCount = LE_16_TO_NATIVE(swf->frameCount);
/* read tags and connect to list */
t1.next = 0;
/* read tags and connect to list */
t1.next = 0;
@@
-1859,7
+1873,7
@@
int swf_WriteCGI(SWF * swf)
sprintf(s,"Content-type: application/x-shockwave-flash\n"
"Accept-Ranges: bytes\n"
sprintf(s,"Content-type: application/x-shockwave-flash\n"
"Accept-Ranges: bytes\n"
- "Content-Length: %lu\n"
+ "Content-Length: %d\n"
"Expires: Thu, 13 Apr 2000 23:59:59 GMT\n"
"\n",len);
"Expires: Thu, 13 Apr 2000 23:59:59 GMT\n"
"\n",len);