X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/math.h?ds=sidebyside diff --git a/include/wx/math.h b/include/wx/math.h index c1d945c1e2..b398fcc243 100644 --- a/include/wx/math.h +++ b/include/wx/math.h @@ -1,10 +1,10 @@ /** -* Name: math.h +* Name: wx/math.h * Purpose: Declarations/definitions of common math functions * Author: John Labenski and others * Modified by: * Created: 02/02/03 -* RCS-ID: +* RCS-ID: $Id$ * Copyright: (c) John Labenski * Licence: wxWindows licence */ @@ -14,10 +14,6 @@ #ifndef _WX_MATH_H_ #define _WX_MATH_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "math.h" -#endif - #include "wx/defs.h" #include @@ -26,9 +22,9 @@ #define M_PI 3.1415926535897932384626433832795 #endif -/* Scaling factors for various unit conversions */ +/* Scaling factors for various unit conversions: 1 inch = 2.54 cm */ #ifndef METRIC_CONVERSION_CONSTANT - #define METRIC_CONVERSION_CONSTANT 0.0393700787 + #define METRIC_CONVERSION_CONSTANT (1./254) #endif #ifndef mm2inches @@ -80,5 +76,75 @@ #define wxIsNaN(x) ((x) != (x)) #endif +#ifdef __cplusplus + + #ifdef __INTELC__ + + inline bool wxIsSameDouble(double x, double y) + { + // VZ: this warning, given for operators==() and !=() is not wrong, as == + // 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 + #pragma warning(push) + + // floating-point equality and inequality comparisons are unreliable + #pragma warning(disable: 1572) + + return x == y; + + #pragma warning(pop) + } + + #else /* !__INTELC__ */ + + inline bool wxIsSameDouble(double x, double y) { return x == y; } + + #endif /* __INTELC__/!__INTELC__ */ + + inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); } + + inline int wxRound(double x) + { + wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5, + _T("argument out of supported range") ); + + #if defined(HAVE_ROUND) + return int(round(x)); + #else + return (int)(x < 0 ? x - 0.5 : x + 0.5); + #endif + } +#endif /* __cplusplus */ + + +#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)))) +#endif + +#if wxUSE_APPLE_IEEE +#ifdef __cplusplus + extern "C" { +#endif + /* functions from common/extended.c */ + WXDLLEXPORT wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes); + WXDLLEXPORT 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) ); +#endif // WXWIN_COMPATIBILITY_2_8 + +#ifdef __cplusplus + } +#endif +#endif /* wxUSE_APPLE_IEEE */ + #endif /* _WX_MATH_H_ */