Remove unnecessary comparison of unsigned variable with 0.

[wxWidgets.git] / src / common / extended.c

diff --git a/src/common/extended.c b/src/common/extended.c
index eb4089e4abd11ba10c5ef065a5691ba5b2f14675..6844663420abaed0576ed8d7a0db7947b881ec9f 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -8,6 +8,12 @@
 *****************************************************************************/
 
 
 *****************************************************************************/
 
 

+#if defined(_WIN32_WCE)
+    /* eVC cause warnings in its own headers: stdlib.h and winnt.h */
+    #pragma warning (disable:4115)
+    #pragma warning (disable:4214)
+#endif
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>


@@ -15,9 +21,14 @@
 #include <string.h>
 #include "wx/defs.h"
 
 #include <string.h>
 #include "wx/defs.h"
 

+#if defined(_WIN32_WCE)
+    #pragma warning (default:4115)
+    #pragma warning (default:4214)
+#endif
+

 #if wxUSE_APPLE_IEEE
 
 #if wxUSE_APPLE_IEEE
 

-#include <math.h>
+#include "wx/math.h"

 
 /* Copyright (C) 1989-1991 Ken Turkowski. <turk@computer.org>
  *
 
 /* Copyright (C) 1989-1991 Ken Turkowski. <turk@computer.org>
  *


@@ -42,13 +53,13 @@
  * Infinities are, however, preserved on IEEE machines.
  *
  * These routines have been tested on the following machines:
  * Infinities are, however, preserved on IEEE machines.
  *
  * These routines have been tested on the following machines:

- *     Apple Macintosh, MPW 3.1 C compiler
- *     Apple Macintosh, THINK C compiler
- *     Silicon Graphics IRIS, MIPS compiler
- *     Cray X/MP and Y/MP
- *     Digital Equipment VAX
- *     Sequent Balance (Multiprocesor 386)
- *     NeXT
+ *    Apple Macintosh, MPW 3.1 C compiler
+ *    Apple Macintosh, THINK C compiler
+ *    Silicon Graphics IRIS, MIPS compiler
+ *    Cray X/MP and Y/MP
+ *    Digital Equipment VAX
+ *    Sequent Balance (Multiprocesor 386)
+ *    NeXT

  *
  *
  * Implemented by Malcolm Slaney and Ken Turkowski.
  *
  *
  * Implemented by Malcolm Slaney and Ken Turkowski.


@@ -77,16 +88,16 @@
  * Silicon Graphics MIPS-based Iris.
  ****************************************************************/
 
  * Silicon Graphics MIPS-based Iris.
  ****************************************************************/
 

-#ifdef applec  /* The Apple C compiler works */
-# define FloatToUnsigned(f)    ((wxUint32)(f))
-# define UnsignedToFloat(u)    ((wxFloat64)(u))
+#ifdef applec    /* The Apple C compiler works */
+# define FloatToUnsigned(f)   ((wxUint32)(f))
+# define UnsignedToFloat(u)   ((wxFloat64)(u))

 #else /*applec*/
 #else /*applec*/

-# define FloatToUnsigned(f)    ((wxUint32)((((wxInt32)((f) - 2147483648.0)) + 2147483647L) + 1))
-# define UnsignedToFloat(u)    (((wxFloat64)((wxInt32)((u) - 2147483647L - 1))) + 2147483648.0)
+# define FloatToUnsigned(f)   ((wxUint32)(((wxInt32)((f) - 2147483648.0)) + 2147483647L) + 1)
+# define UnsignedToFloat(u)   (((wxFloat64)((wxInt32)((u) - 2147483647L - 1))) + 2147483648.0)

 #endif /*applec*/
 
 
 #endif /*applec*/
 
 

- 
+

 /****************************************************************
  * Extended precision IEEE floating-point conversion routines.
  * Extended is an 80-bit number as defined by Motorola,
 /****************************************************************
  * Extended precision IEEE floating-point conversion routines.
  * Extended is an 80-bit number as defined by Motorola,


@@ -94,92 +105,102 @@
  * and a 64-bit mantissa, with no hidden bit.
  ****************************************************************/
 
  * and a 64-bit mantissa, with no hidden bit.
  ****************************************************************/
 

-wxFloat64 ConvertFromIeeeExtended(wxInt8* bytes)
+WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)

 {
 {

-       wxFloat64       f;
-       wxInt32 expon;
-       wxUint32 hiMant, loMant;
-       
-       expon = ((bytes[0] & 0x7F) << 8) | (bytes[1] & 0xFF);
-       hiMant  =       ((wxUint32)(bytes[2] & 0xFF) << 24)
-                       |       ((wxUint32)(bytes[3] & 0xFF) << 16)
-                       |       ((wxUint32)(bytes[4] & 0xFF) << 8)
-                       |       ((wxUint32)(bytes[5] & 0xFF));
-       loMant  =       ((wxUint32)(bytes[6] & 0xFF) << 24)
-                       |       ((wxUint32)(bytes[7] & 0xFF) << 16)
-                       |       ((wxUint32)(bytes[8] & 0xFF) << 8)
-                       |       ((wxUint32)(bytes[9] & 0xFF));
-
-       if (expon == 0 && hiMant == 0 && loMant == 0) {
-               f = 0;
-       }
-       else {
-               if (expon == 0x7FFF) {  /* Infinity or NaN */
-                       f = HUGE_VAL;
-               }
-               else {
-                       expon -= 16383;
-                       f  = ldexp(UnsignedToFloat(hiMant), expon-=31);
-                       f += ldexp(UnsignedToFloat(loMant), expon-=32);
-               }
-       }
-
-       if (bytes[0] & 0x80)
-               return -f;
-       else
-               return f;
+    wxFloat64 f;
+    wxInt32 expon;
+    wxUint32 hiMant, loMant;
+
+    expon = ((bytes[0] & 0x7F) << 8) | (bytes[1] & 0xFF);
+    hiMant = ((wxUint32)(bytes[2] & 0xFF) << 24)
+            | ((wxUint32)(bytes[3] & 0xFF) << 16)
+            | ((wxUint32)(bytes[4] & 0xFF) << 8)
+            | ((wxUint32)(bytes[5] & 0xFF));
+    loMant = ((wxUint32)(bytes[6] & 0xFF) << 24)
+            | ((wxUint32)(bytes[7] & 0xFF) << 16)
+            | ((wxUint32)(bytes[8] & 0xFF) << 8)
+            | ((wxUint32)(bytes[9] & 0xFF));
+
+    if (expon == 0 && hiMant == 0 && loMant == 0) {
+        f = 0;
+    }
+    else {
+        if (expon == 0x7FFF) { /* Infinity or NaN */
+            f = HUGE_VAL;
+        }
+        else {
+            expon -= 16383;
+            f  = ldexp(UnsignedToFloat(hiMant), expon-=31);
+            f += ldexp(UnsignedToFloat(loMant), expon-=32);
+        }
+    }
+
+    if (bytes[0] & 0x80)
+        return -f;
+    else
+        return f;

 }
 
 
 /****************************************************************/
 
 
 }
 
 
 /****************************************************************/
 
 

-void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)

 {
 {

-       wxInt32 sign;
-       wxInt32 expon;
-       wxFloat64 fMant, fsMant;
-       wxUint32 hiMant, loMant;
-
-       if (num < 0) {
-               sign = 0x8000;
-               num *= -1;
-       } else {
-               sign = 0;
-       }
-
-       if (num == 0) {
-               expon = 0; hiMant = 0; loMant = 0;
-       }
-       else {
-               fMant = frexp(num, &expon);
-               if ((expon > 16384) || !(fMant < 1)) {  /* Infinity or NaN */
-                       expon = sign|0x7FFF; hiMant = 0; loMant = 0; /* infinity */
-               }
-               else {  /* Finite */
-                       expon += 16382;
-                       if (expon < 0) {        /* denormalized */
-                               fMant = ldexp(fMant, expon);
-                               expon = 0;
-                       }
-                       expon |= sign;
-                       fMant = ldexp(fMant, 32);          fsMant = floor(fMant); hiMant = FloatToUnsigned(fsMant);
-                       fMant = ldexp(fMant - fsMant, 32); fsMant = floor(fMant); loMant = FloatToUnsigned(fsMant);
-               }
-       }
-       
-       bytes[0] = expon >> 8;
-       bytes[1] = expon;
-       bytes[2] = hiMant >> 24;
-       bytes[3] = hiMant >> 16;
-       bytes[4] = hiMant >> 8;
-       bytes[5] = hiMant;
-       bytes[6] = loMant >> 24;
-       bytes[7] = loMant >> 16;
-       bytes[8] = loMant >> 8;
-       bytes[9] = loMant;
+    wxInt32 sign;
+    wxInt32 expon;
+    wxFloat64 fMant, fsMant;
+    wxUint32 hiMant, loMant;
+
+    if (num < 0) {
+        sign = 0x8000;
+        num *= -1;
+    } else {
+        sign = 0;
+    }
+
+    if (num == 0) {
+        expon = 0; hiMant = 0; loMant = 0;
+    }
+    else {
+        fMant = frexp(num, &expon);
+        if ((expon > 16384) || !(fMant < 1)) { /* Infinity or NaN */
+            expon = sign|0x7FFF; hiMant = 0; loMant = 0; /* infinity */
+        }
+        else { /* Finite */
+            expon += 16382;
+            if (expon < 0) { /* denormalized */
+                fMant = ldexp(fMant, expon);
+                expon = 0;
+            }
+            expon |= sign;
+            fMant = ldexp(fMant, 32);          fsMant = floor(fMant); hiMant = FloatToUnsigned(fsMant);
+            fMant = ldexp(fMant - fsMant, 32); fsMant = floor(fMant); loMant = FloatToUnsigned(fsMant);
+        }
+    }
+
+    bytes[0] = expon >> 8;
+    bytes[1] = expon;
+    bytes[2] = hiMant >> 24;
+    bytes[3] = hiMant >> 16;
+    bytes[4] = hiMant >> 8;
+    bytes[5] = hiMant;
+    bytes[6] = loMant >> 24;
+    bytes[7] = loMant >> 16;
+    bytes[8] = loMant >> 8;
+    bytes[9] = loMant;

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2_8
+WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
+{
+    return wxConvertFromIeeeExtended(bytes);
+}

 
 

+WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+{
+    wxConvertToIeeeExtended(num, bytes);
+}
+#endif // WXWIN_COMPATIBILITY_2_8

 
 #endif /* wxUSE_APPLE_IEEE */
 
 #endif /* wxUSE_APPLE_IEEE */