From 3dd317796d1cd20deeaa997cd7941de9bc3e306f Mon Sep 17 00:00:00 2001 From: Fernando Cacciola Date: Mon, 1 Mar 2010 13:44:00 +0000 Subject: [PATCH] Fixed warnings --- .../Straight_skeleton_builder_traits_2_aux.h | 6 ++++++ .../include/CGAL/predicates/Straight_skeleton_pred_ftC2.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h index 28edf0673f4..c31a36790c8 100644 --- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h +++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h @@ -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 ; + } } diff --git a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h index c9af0569bb3..e7850bd507b 100644 --- a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h @@ -147,13 +147,13 @@ Uncertain certified_trisegment_collinearity ( Segment_2 Uncertain 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;