X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/225dfbc51713da154f0bdc03f3ce06b9cba97970..6eefca4fb7793a8d6bc02e69694735cb3e5fc230:/include/wx/math.h diff --git a/include/wx/math.h b/include/wx/math.h index b398fcc243..33831c274d 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -24,7 +24,7 @@ /* Scaling factors for various unit conversions: 1 inch = 2.54 cm */ #ifndef METRIC_CONVERSION_CONSTANT - #define METRIC_CONVERSION_CONSTANT (1./254) + #define METRIC_CONVERSION_CONSTANT (1/25.4) #endif #ifndef mm2inches @@ -57,9 +57,16 @@ #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) #include #define wxFinite(x) _finite(x) -#elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ +#elif defined(__MINGW64__) + // add more compilers with C99 support here: using C99 isfinite() is + // preferable to using BSD-ish finite() + #define wxFinite(x) isfinite(x) +#elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ - defined(__HPUX__)||defined(__MWERKS__) + defined(__HPUX__)||defined(__MWERKS__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 ) +#ifdef __SOLARIS__ +#include +#endif #define wxFinite(x) finite(x) #else #define wxFinite(x) ((x) == (x)) @@ -86,7 +93,7 @@ // shouldn't be used with doubles, but we get too many of them and // removing these operators is probably not a good idea // - // Maybe we should alway compare doubles up to some "epsilon" precision + // Maybe we should always compare doubles up to some "epsilon" precision #pragma warning(push) // floating-point equality and inequality comparisons are unreliable @@ -108,7 +115,7 @@ inline int wxRound(double x) { wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5, - _T("argument out of supported range") ); + wxT("argument out of supported range") ); #if defined(HAVE_ROUND) return int(round(x)); @@ -121,10 +128,8 @@ #if defined(__WXMSW__) && !defined(__WXWINCE__) #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) -#elif defined( __WXMAC__ ) - #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) ) #else - #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c)))) + #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c)))) #endif #if wxUSE_APPLE_IEEE @@ -132,13 +137,13 @@ extern "C" { #endif /* functions from common/extended.c */ - WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes); - WXDLLEXPORT void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes); + WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes); + WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes); /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */ #if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) ); - wxDEPRECATED( WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) ); + wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) ); + wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) ); #endif // WXWIN_COMPATIBILITY_2_8 #ifdef __cplusplus