diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-28 11:51:17 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-11-28 12:00:10 +0400 |
| commit | a628ca9ebe3a5296e197f12adf5988cb37f6050b (patch) | |
| tree | 51628098dd155ffc0d8295b98fdd09aaa9d97fe8 /extern/carve/lib/geom2d.cpp | |
| parent | 1c14ead46f6aa7cc850033cf77d59127ca257b93 (diff) | |
Update Carve to upstream version be054bc7ed86
Diffstat (limited to 'extern/carve/lib/geom2d.cpp')
| -rw-r--r-- | extern/carve/lib/geom2d.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extern/carve/lib/geom2d.cpp b/extern/carve/lib/geom2d.cpp index bfa84f5fd24..96527e485a5 100644 --- a/extern/carve/lib/geom2d.cpp +++ b/extern/carve/lib/geom2d.cpp @@ -177,12 +177,12 @@ namespace carve { break; } case INTERSECTION_PP: { - out.push_back(PolyIntersectionInfo(INTERSECT_VERTEX, e.ipoint, i + e.p2 - 2)); + out.push_back(PolyIntersectionInfo(INTERSECT_VERTEX, e.ipoint, i + (size_t)e.p2 - 2)); count++; break; } case INTERSECTION_LP: { - out.push_back(PolyIntersectionInfo(INTERSECT_VERTEX, e.ipoint, i + e.p2 - 2)); + out.push_back(PolyIntersectionInfo(INTERSECT_VERTEX, e.ipoint, i + (size_t)e.p2 - 2)); count++; break; } @@ -192,7 +192,9 @@ namespace carve { break; } case COLINEAR: { - int n1 = (int)i, n2 = (int)j; + size_t n1 = i; + size_t n2 = j; + P2 q1 = points[i], q2 = points[j]; if (q2 < q1) { std::swap(q1, q2); std::swap(n1, n2); } |