changeset 54:4d0fe18e5ce3 libavutil

simplify
author michael
date Mon, 03 Jul 2006 12:09:10 +0000
parents 01299a828431
children 83260d3a9453
files intfloat_readwrite.c
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/intfloat_readwrite.c	Mon Jul 03 11:11:22 2006 +0000
+++ b/intfloat_readwrite.c	Mon Jul 03 12:09:10 2006 +0000
@@ -43,7 +43,7 @@
     int e, i;
 
     for (i = 0; i < 8; i++)
-        m |= (uint64_t)ext.mantissa[i]<<(56-(i<<3));
+        m = (m<<8) + ext.mantissa[i];
     e = (((int)ext.exponent[0]&0x7f)<<8) | ext.exponent[1];
     if (e == 0x7fff && m)
         return 0.0/0.0;
@@ -51,7 +51,7 @@
                              * mantissa bit is written as opposed to the
                              * single and double precision formats */
     if (ext.exponent[0]&0x80)
-        return ldexp(-m, e);
+        m= -m;
     return ldexp(m, e);
 }
 
@@ -72,7 +72,7 @@
 }
 
 AVExtFloat av_dbl2ext(double d){
-    struct AVExtFloat ext;
+    struct AVExtFloat ext= {{0}};
     int e, i; double f; uint64_t m;
 
     f = fabs(frexp(d, &e));
@@ -83,11 +83,8 @@
         m = (uint64_t)ldexp(f, 64);
         for (i=0; i < 8; i++)
             ext.mantissa[i] = m>>(56-(i<<3));
-    } else if (f == 0.0) {
-        memset (&ext, 0, 10);
-    } else {
+    } else if (f != 0.0) {
         ext.exponent[0] = 0x7f; ext.exponent[1] = 0xff;
-        memset (&ext.mantissa, 0, 8);
         if (f != 1/0.0)
             ext.mantissa[0] = ~0;
     }