diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h index 4f3f0775b51..9dcedd07ab1 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Cone.h @@ -201,8 +201,6 @@ namespace CGAL { m_neg_sin_ang = -sin(m_angle); m_cos_ang = cos(m_angle); - this->m_cross_mask = (m_angle <= M_PI_4); - this->m_is_valid = true; } diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h index 6fe5a7e069d..fe59d51fd84 100644 --- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h +++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h @@ -93,8 +93,7 @@ namespace CGAL { m_score(0), m_sum_expected_value(0), m_nb_subset_used(0), - m_has_connected_component(false), - m_cross_mask(false) { + m_has_connected_component(false) { } virtual ~Shape_base() {} @@ -180,8 +179,8 @@ namespace CGAL { continue; unsigned int w = (x > 0) ? bitmap[y * u_extent + x - 1] : 0; unsigned int n = (y > 0) ? bitmap[(y - 1) * u_extent + x] : 0; - unsigned int nw = (m_cross_mask) ? 0 : ((x > 0 && y > 0) ? bitmap[(y - 1) * u_extent + x - 1] : 0); - unsigned int ne = (m_cross_mask) ? 0 : (((x + 1 < u_extent) && y > 0) ? bitmap[(y - 1) * u_extent + x + 1] : 0); + unsigned int nw = (x > 0 && y > 0) ? bitmap[(y - 1) * u_extent + x - 1]; + unsigned int ne = ((x + 1 < u_extent) && y > 0) ? bitmap[(y - 1) * u_extent + x + 1]; // Find smallest set label; unsigned int curLabel = map.size(); @@ -597,7 +596,6 @@ namespace CGAL { //and thus indicate the next one to use std::size_t m_nb_subset_used; bool m_has_connected_component; - bool m_cross_mask; Input_iterator m_first;