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

fix warnings

This commit is contained in:
Sébastien Loriot 2021-10-26 11:15:03 +02:00
parent 546ab87feb
commit b26a46a852
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Intersections_2/include/CGAL/Intersections_2/Segment_2_Segment_2.h
View File

@ -76,7 +76,7 @@ S2S2_inter_info
seg_seg_do_intersect_crossing( seg_seg_do_intersect_crossing(
const typename K::Point_2& p1, const typename K::Point_2& p2, const typename K::Point_2& p1, const typename K::Point_2& p2,
const typename K::Point_2& p3, const typename K::Point_2& p4, const typename K::Point_2& p3, const typename K::Point_2& p4,
int i1, int i2, int i3, int i4, int /* i1 */, int i2, int i3, int /* i4 */,
const K& k, bool extra_test) const K& k, bool extra_test)
{ {
switch (make_certain(k.orientation_2_object()(p1,p2,p3))) { switch (make_certain(k.orientation_2_object()(p1,p2,p3))) {
@ -88,7 +88,7 @@ seg_seg_do_intersect_crossing(
return S2S2_inter_info(i2); return S2S2_inter_info(i2);
case RIGHT_TURN: case RIGHT_TURN:
return S2S2_inter_info(false); return S2S2_inter_info(false);
case LEFT_TURN: default: // LEFT_TURN
return S2S2_inter_info(true); return S2S2_inter_info(true);
} }
} }
@ -100,11 +100,11 @@ seg_seg_do_intersect_crossing(
return S2S2_inter_info(i2); return S2S2_inter_info(i2);
case RIGHT_TURN: case RIGHT_TURN:
return S2S2_inter_info(true); return S2S2_inter_info(true);
case LEFT_TURN: default: // LEFT_TURN
return S2S2_inter_info(false); return S2S2_inter_info(false);
} }
} }
case COLLINEAR: default: //COLLINEAR
if (extra_test && k.collinear_2_object()(p3,p4,p2)) if (extra_test && k.collinear_2_object()(p3,p4,p2))
return S2S2_inter_info(i3, i2); return S2S2_inter_info(i3, i2);
return S2S2_inter_info(i3); return S2S2_inter_info(i3);
@ -131,7 +131,7 @@ S2S2_inter_info
seg_seg_do_intersect_contained( seg_seg_do_intersect_contained(
const typename K::Point_2& p1, const typename K::Point_2& p2, const typename K::Point_2& p1, const typename K::Point_2& p2,
const typename K::Point_2& p3, const typename K::Point_2& p4, const typename K::Point_2& p3, const typename K::Point_2& p4,
int i1, int i2, int i3, int i4, int /* i1 */, int /* i2 */, int i3, int i4,
const K& k, bool extra_test) const K& k, bool extra_test)
{ {
switch (make_certain(k.orientation_2_object()(p1,p2,p3))) { switch (make_certain(k.orientation_2_object()(p1,p2,p3))) {
@ -143,7 +143,7 @@ seg_seg_do_intersect_contained(
return S2S2_inter_info(i4); return S2S2_inter_info(i4);
case RIGHT_TURN: case RIGHT_TURN:
return S2S2_inter_info(true); return S2S2_inter_info(true);
case LEFT_TURN: default: // LEFT_TURN
return S2S2_inter_info(false); return S2S2_inter_info(false);
} }
} }
@ -155,11 +155,11 @@ seg_seg_do_intersect_contained(
return S2S2_inter_info(i4); return S2S2_inter_info(i4);
case RIGHT_TURN: case RIGHT_TURN:
return S2S2_inter_info(false); return S2S2_inter_info(false);
case LEFT_TURN: default: // LEFT_TURN
return S2S2_inter_info(true); return S2S2_inter_info(true);
} }
} }
case COLLINEAR: default: // COLLINEAR
if (extra_test && k.collinear_2_object()(p3,p4,p2)) if (extra_test && k.collinear_2_object()(p3,p4,p2))
return S2S2_inter_info(i3, i4); return S2S2_inter_info(i3, i4);
return S2S2_inter_info(i3); return S2S2_inter_info(i3);

8
Intersections_2/test/Intersections_2/test_intersections_2.cpp
View File

@ -433,10 +433,10 @@ struct Test
check_intersection (S(p( 1, 10), p( 1, 2)), S(p( 1, 7), p( 1, 3)), S(P( 1, 3), P( 1, 7))); check_intersection (S(p( 1, 10), p( 1, 2)), S(p( 1, 7), p( 1, 3)), S(P( 1, 3), P( 1, 7)));
// exact point intersection // exact point intersection
check_intersection (S(p( 3.14, 0), p( 3.14, 10)), S(p( 3.14, 3.456), p( 5, 10)), p( 3.14, 3.456)); check_intersection (S(p( 3, 0), p( 3, 10)), S(p( 3, 3), p( 5, 10)), p( 3, 3));
check_intersection (S(p( 3.14, 0), p( 3.14, 10)), S(p( 5, 10), p( 3.14, 3.456)), p( 3.14, 3.456)); check_intersection (S(p( 3, 0), p( 3, 10)), S(p( 5, 10), p( 3, 3)), p( 3, 3));
check_intersection (S(p( 3.14, 0), p( 3.14, 10)), S(p( 3.14, 3.456), p( -5, 10)), p( 3.14, 3.456)); check_intersection (S(p( 3, 0), p( 3, 10)), S(p( 3, 3), p( -5, 10)), p( 3, 3));
check_intersection (S(p( 3.14, 0), p( 3.14, 10)), S(p( -5, 10), p( 3.14, 3.456)), p( 3.14, 3.456)); check_intersection (S(p( 3, 0), p( 3, 10)), S(p( -5, 10), p( 3, 3)), p( 3, 3));
check_intersection (S(p( 0, 0), p( 44, 44)), S(p( 44, 44), p( 55, 55)), p( 44, 44)); check_intersection (S(p( 0, 0), p( 44, 44)), S(p( 44, 44), p( 55, 55)), p( 44, 44));
check_intersection (S(p( 0, 0), p( 44, 44)), S(p( 55, 55), p( 44, 44)), p( 44, 44)); check_intersection (S(p( 0, 0), p( 44, 44)), S(p( 55, 55), p( 44, 44)), p( 44, 44));
check_intersection (S(p( 44, 44), p( 0, 0)), S(p( 44, 44), p( 55, 55)), p( 44, 44)); check_intersection (S(p( 44, 44), p( 0, 0)), S(p( 44, 44), p( 55, 55)), p( 44, 44));