X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Frfxswf.c;h=18b2c569816047eb7c1270d1a63306a702f05537;hb=fc815311aa1bd67877b404493838dfd85a86f596;hp=d601a1550849d7fe508943bf6fdfa71c96a7b33c;hpb=ebb61a567502ebe4b3d3c4b3284964600fecd90b;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index d601a15..18b2c56 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -177,7 +177,9 @@ int swf_SetU16(TAG * t,U16 v)
 void swf_SetS16(TAG * t,int v)
 {
     if(v>32767 || v<-32768) {
+      #ifdef DEBUG_RFXSWF
 	fprintf(stderr, "Warning: S16 overflow: %d\n", v);
+      #endif
     }
     swf_SetU16(t, (S16)v);
 }
@@ -406,6 +408,34 @@ int swf_SetU30String(TAG*tag, const char*str, int l)
     swf_SetBlock(tag, (void*)str, l);
     return len;
 }
+float swf_GetF16(TAG * t)
+{
+    // D16 is 1-5-10
+    // D32 is 1-8-23
+    U16 f1 = swf_GetU16(t);
+    if(!f1) return 0;
+    U32 f2 = (f1&0x8000)<<16; //sign
+    f2 |= ((f1&0x7c00)<<13)+(0x40000000-(0x4000<<13)); //exp
+    f2 |= (f1&0x03ff)<<13; //mantissa
+    return *(float*)&f2;
+}
+void swf_SetF16(TAG * t, float f)
+{
+    U32 f1 = *(U32*)&f;
+    U16 f2 = (f1>>16)&0x8000;
+    int exp = ((f1>>23)&0xff)-0x80+0x10;
+    if(exp<0) {
+	exp = 0;
+	fprintf(stderr, "Exponent underflow in FLOAT16 encoding\n");
+    } else if(exp>=32) {
+	exp = 31;
+	fprintf(stderr, "Exponent overflow in FLOAT16 encoding\n");
+    }
+    f2 |= exp<<10;
+    f2 |= (f1>>13)&0x3ff;
+    swf_SetU16(t, f2);
+}
+
 double swf_GetD64(TAG*tag)
 {
     /* FIXME: this is not big-endian compatible */
@@ -629,7 +659,9 @@ int swf_SetRect(TAG * t,SRECT * r)
   nbits = swf_CountBits(r->ymin,nbits);
   nbits = swf_CountBits(r->ymax,nbits);
   if(nbits>=32) {
+    #ifdef DEBUG_RFXSWF
     fprintf(stderr, "rfxswf: Warning: num_bits overflow in swf_SetRect\n");
+    #endif
     nbits=31;
   }
 
@@ -795,7 +827,9 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
     nbits = swf_CountBits(m->sy,nbits);
     if(nbits>=32) {
         /* TODO: happens on AMD64 systems for normal values? */
+        #ifdef DEBUG_RFXSWF
 	fprintf(stderr,"rfxswf: Error: matrix values too large\n");
+        #endif
 	nbits = 31;
     }
     swf_SetBits(t,nbits,5);
@@ -809,7 +843,9 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
     nbits = swf_CountBits(m->r0,0);
     nbits = swf_CountBits(m->r1,nbits);
     if(nbits>=32) {
+        #ifdef DEBUG_RFXSWF
 	fprintf(stderr,"rfxswf: Error: matrix values too large\n");
+        #endif
 	nbits = 31;
     }
     swf_SetBits(t,nbits,5);
@@ -820,7 +856,9 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
   nbits = swf_CountBits(m->tx,0);
   nbits = swf_CountBits(m->ty,nbits);
   if(nbits>=32) {
+      #ifdef DEBUG_RFXSWF
       fprintf(stderr,"rfxswf: Error: matrix values too large\n");
+      #endif
       nbits = 31;
   }
   swf_SetBits(t,nbits,5);
@@ -949,7 +987,7 @@ void  swf_SetPassword(TAG * t, const char * password)
     md5string = crypt_md5(password, salt);
 
     swf_SetU16(t,0);
-    swf_SetString(t, (U8*)md5string);
+    swf_SetString(t, md5string);
 } 
 
 void swf_SetString(TAG*t, const char* s) 
@@ -957,7 +995,7 @@ void swf_SetString(TAG*t, const char* s)
     if(!s) {
         swf_SetU8(t, 0);
     } else {
-        swf_SetBlock(t,s,strlen(s)+1);
+        swf_SetBlock(t,(U8*)s,strlen(s)+1);
     }
 }
 
@@ -1104,7 +1142,9 @@ TAG * swf_ReadTag(reader_t*reader, TAG * prev)
   { t->data = (U8*)rfx_alloc(t->len);
     t->memsize = t->len;
     if (reader->read(reader, t->data, t->len) != t->len) {
+      #ifdef DEBUG_RFXSWF
       fprintf(stderr, "rfxswf: Warning: Short read (tagid %d). File truncated?\n", t->id);
+      #endif
       free(t->data);t->data=0;
       free(t);
       return NULL;
@@ -1283,7 +1323,9 @@ void swf_FoldSprite(TAG * t)
   if(t->id!=ST_DEFINESPRITE)
       return;
   if(!t->len) {
+    #ifdef DEBUG_RFXSWF
       fprintf(stderr, "Error: Sprite has no ID!");
+    #endif
       return;
   }
   if(t->len>4) {
@@ -1578,7 +1620,7 @@ int WriteExtraTags(SWF*swf, writer_t*writer)
         if(0 && !has_scenedescription) {
             TAG*scene = swf_InsertTag(0, ST_SCENEDESCRIPTION);
             swf_SetU16(scene, 1);
-            swf_SetString(scene, (U8*)"Scene 1");
+            swf_SetString(scene, "Scene 1");
             swf_SetU8(scene, 0);
             if(writer) {
                 if(swf_WriteTag2(writer, scene)<0)