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

Fixed warnings

This commit is contained in:
Fernando Cacciola 2010-03-01 13:44:00 +00:00
parent 52d8e1c670
commit 3dd317796d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h
View File

@ -314,6 +314,8 @@ public:
mW[0] = aW0 ;
mW[1] = aW1 ;
mW[2] = aW2 ;
CGAL_assertion( (mCollinearity==TRISEGMENT_COLLINEARITY_01) || (mCollinearity==TRISEGMENT_COLLINEARITY_12) || (mCollinearity==TRISEGMENT_COLLINEARITY_02) ) ;
switch ( mCollinearity )
{
@ -325,6 +327,10 @@ public:
case TRISEGMENT_COLLINEARITY_02:
mCSIdxA=0; mCSIdxB=2; mNCSIdx=1; break ;
default:
mCSIdxA=-1; mCSIdxB=-1; mNCSIdx=-1; break ;
}
}

8
Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
View File

@ -147,13 +147,13 @@ Uncertain<Trisegment_collinearity> certified_trisegment_collinearity ( Segment_2
Uncertain<bool> is_12 = ( are_edges_coincident(e1,e2) | are_edges_orderly_collinearC2(e1,e2) ) & ( w1 == w2 );
if ( is_certain(is_12) )
{
if ( is_01 & !is_02 & !is_12 )
if ( is_01 & (!is_02) & (!is_12) )
return TRISEGMENT_COLLINEARITY_01;
else if ( is_02 & !is_01 & !is_12 )
else if ( is_02 & (!is_01) & (!is_12) )
return TRISEGMENT_COLLINEARITY_02;
else if ( is_12 & !is_01 & !is_02 )
else if ( is_12 & (!is_01) & (!is_02) )
return TRISEGMENT_COLLINEARITY_12;
else if ( !is_01 & !is_02 & !is_12 )
else if ( (!is_01) & (!is_02) & (!is_12) )
return TRISEGMENT_COLLINEARITY_NONE;
else
return TRISEGMENT_COLLINEARITY_ALL;