songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more static_cast

This commit is contained in:
Andreas Fabri 2013-02-15 10:39:17 +01:00
parent 4cd2a89bb1
commit 31a098f591
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/Minkowski_sum_conv_2.h
View File

@ -173,7 +173,7 @@ public:
CGAL_precondition (pgn2.is_simple()); CGAL_precondition (pgn2.is_simple());
// Prepare the vector of directions for the first polygon. // Prepare the vector of directions for the first polygon.
const unsigned int n1 = pgn1.size(); const unsigned int n1 = static_cast<unsigned int>(pgn1.size());
const bool forward1 = (pgn1.orientation() == COUNTERCLOCKWISE); const bool forward1 = (pgn1.orientation() == COUNTERCLOCKWISE);
std::vector<Direction_2> dirs1 (n1); std::vector<Direction_2> dirs1 (n1);
Vertex_circulator curr1, next1; Vertex_circulator curr1, next1;
@ -193,7 +193,7 @@ public:
// Prepare the vector of directions for the second polygon. // Prepare the vector of directions for the second polygon.
// Also prepare a list containing all reflex vertices of this polygon. // Also prepare a list containing all reflex vertices of this polygon.
const unsigned int n2 = pgn2.size(); const unsigned int n2 = static_cast<unsigned int>(pgn2.size());
const bool forward2 = (pgn2.orientation() == COUNTERCLOCKWISE); const bool forward2 = (pgn2.orientation() == COUNTERCLOCKWISE);
std::vector<Direction_2> dirs2 (n2); std::vector<Direction_2> dirs2 (n2);
Vertex_circulator prev2, curr2, next2; Vertex_circulator prev2, curr2, next2;
@ -527,7 +527,7 @@ private:
// the list contains no "cyclic" sub-cylces. We do that by making sure that // the list contains no "cyclic" sub-cylces. We do that by making sure that
// the first and last segments of the list correspond to traversals of // the first and last segments of the list correspond to traversals of
// different polygons. // different polygons.
int steps = cycle.size(); int steps = static_cast<int>(cycle.size());
while (steps > 0 && while (steps > 0 &&
cycle.front().label().get_flag() == cycle.front().label().get_flag() ==

10
Minkowski_sum_2/include/CGAL/Small_side_angle_bisector_decomposition_2.h
View File

@ -247,7 +247,7 @@ private:
unsigned int i) const unsigned int i) const
{ {
if (i == 0) if (i == 0)
return (vec.size() - 1); return static_cast<unsigned int>(vec.size() - 1);
return (i - 1); return (i - 1);
} }
@ -414,7 +414,7 @@ private:
Point_vector_2& vec) const Point_vector_2& vec) const
{ {
// Resize the vector to fit the polygon. // Resize the vector to fit the polygon.
const unsigned int n = pgn.size(); const unsigned int n = static_cast<unsigned int>(pgn.size());
const bool forward = (pgn.orientation() == COUNTERCLOCKWISE); const bool forward = (pgn.orientation() == COUNTERCLOCKWISE);
Vertex_circulator prev, curr, next; Vertex_circulator prev, curr, next;
unsigned int reflex_count = 0; unsigned int reflex_count = 0;
@ -755,7 +755,7 @@ private:
} }
else if (*iter < ind1) else if (*iter < ind1)
{ {
vec2[i2].visible.push_back (*iter + vec.size() - ind2); vec2[i2].visible.push_back (*iter + static_cast<unsigned int>(vec.size()) - ind2);
} }
} }
@ -769,7 +769,7 @@ private:
} }
else if (*iter < ind1) else if (*iter < ind1)
{ {
vec2[i2].non_visible.push_back (*iter + vec.size() - ind2); vec2[i2].non_visible.push_back (*iter + static_cast<int>(vec.size()) - ind2);
} }
} }
} }
@ -922,7 +922,7 @@ private:
OutputIterator _output_polygon (const Point_vector_2& vec, OutputIterator _output_polygon (const Point_vector_2& vec,
OutputIterator oi) const OutputIterator oi) const
{ {
const unsigned int n = vec.size(); const unsigned int n = static_cast<int>(vec.size());
Polygon_2 pgn; Polygon_2 pgn;
unsigned int k; unsigned int k;