Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call std::sin, std::cos functions.

Browse Source 
This is for the sake of consistency because everywhere else there are used trigonometric functions from standard C library (only <math.h> is included).
This commit is contained in:
Artur Wieczorek
2016-04-22 21:15:41 +02:00
parent 8a7374e5ca
commit e962172cd9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/graphicsd2d.cpp
View File

@@ -14,9 +14,6 @@
// Minimum supported client: Windows 8 and Platform Update for Windows 7 // Minimum supported client: Windows 8 and Platform Update for Windows 7
#define wxD2D_DEVICE_CONTEXT_SUPPORTED 0 #define wxD2D_DEVICE_CONTEXT_SUPPORTED 0
#include <algorithm>
#include <cfloat>
#include <cmath>
#include <list> #include <list>
// Ensure no previous defines interfere with the Direct2D API headers // Ensure no previous defines interfere with the Direct2D API headers
@@ -65,7 +62,8 @@
#include "wx/module.h" #include "wx/module.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#endif // WX_PRECOMP #include "wx/math.h"
#endif // !WX_PRECOMP
#include "wx/graphics.h" #include "wx/graphics.h"
#include "wx/dynlib.h" #include "wx/dynlib.h"
@@ -1171,8 +1169,8 @@ void wxD2DPathData::AddCurveToPoint(wxDouble cx1, wxDouble cy1, wxDouble cx2, wx
void wxD2DPathData::AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise) void wxD2DPathData::AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise)
{ {
wxPoint2DDouble center = wxPoint2DDouble(x, y); wxPoint2DDouble center = wxPoint2DDouble(x, y);
wxPoint2DDouble start = wxPoint2DDouble(std::cos(startAngle) * r, std::sin(startAngle) * r); wxPoint2DDouble start = wxPoint2DDouble(cos(startAngle) * r, sin(startAngle) * r);
wxPoint2DDouble end = wxPoint2DDouble(std::cos(endAngle) * r, std::sin(endAngle) * r); wxPoint2DDouble end = wxPoint2DDouble(cos(endAngle) * r, sin(endAngle) * r);
if (m_figureOpened) if (m_figureOpened)
{ {