v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build warnings on MSVC14 x64 in sweep context sources.

pull/1083/head
Jared Mulconry 2016-11-27 13:39:09 +11:00
parent 387afcf74f
commit 2d563180ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/poly2tri/poly2tri/sweep/sweep_context.cc
View File

@ -96,7 +96,7 @@ void SweepContext::InitTriangulation()
void SweepContext::InitEdges(std::vector<Point*> polyline) void SweepContext::InitEdges(std::vector<Point*> polyline)
{ {
int num_points = polyline.size(); int num_points = static_cast<int>(polyline.size());
for (int i = 0; i < num_points; i++) { for (int i = 0; i < num_points; i++) {
int j = i < num_points - 1 ? i + 1 : 0; int j = i < num_points - 1 ? i + 1 : 0;
edge_list.push_back(new Edge(*polyline[i], *polyline[j])); edge_list.push_back(new Edge(*polyline[i], *polyline[j]));

2
contrib/poly2tri/poly2tri/sweep/sweep_context.h
View File

@ -158,7 +158,7 @@ inline AdvancingFront* SweepContext::front()
inline int SweepContext::point_count() inline int SweepContext::point_count()
{ {
return points_.size(); return static_cast<int>(points_.size());
} }
inline void SweepContext::set_head(Point* p1) inline void SweepContext::set_head(Point* p1)